Migrate test helper binaries to run in the Rust test harness.

This simplifies the integration tests and makes them more realistic by asserting on the actual output when the test is run by the test harness rather than faking the output by manually running the test function.

PiperOrigin-RevId: 497906957

Author: hovinenb

README.md

@@ -1,4 +1,4 @@
-# Google Rust testing library
+# GoogleTest Rust
 
 This library brings the rich assertion types of Google's C++ testing library
 [GoogleTest](https://github.com/google/googletest) to Rust. It provides:
@@ -47,6 +47,9 @@ fn more_than_one_failure() -> Result<()> {
 }
 ```
 
+> In case one wants behaviour closer to other Rust test libraries, the macro
+> [`assert_that!`] has the same [`verify_that!`] but panics on failure.
+
 This library includes a rich set of matchers, covering:
 
  * Equality, numeric inequality, and approximate equality;
@@ -268,6 +271,7 @@ Please read [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute
 to this project.
 
 [`and_log_failure()`]: https://docs.rs/googletest/*/googletest/trait.GoogleTestSupport.html#tymethod.and_log_failure
+[`assert_that!`]: https://docs.rs/googletest/*/googletest/macro.assert_that.html
 [`fail!`]: https://docs.rs/googletest/*/googletest/macro.fail.html
 [`google_test`]: https://docs.rs/googletest/*/googletest/attr.google_test.html
 [`matches_pattern!`]: https://docs.rs/googletest/*/googletest/macro.matches_pattern.html

googletest/Cargo.toml

@@ -14,7 +14,7 @@
 
 [package]
 name = "googletest"
-version = "0.1.1"
+version = "0.2.0"
 keywords = ["unit", "matcher", "testing", "assertions"]
 categories = ["development-tools", "development-tools::testing"]
 description = "A rich assertion and matcher library inspired by GoogleTest for C++"
@@ -32,7 +32,7 @@ authors = [
 doctest = false
 
 [dependencies]
-googletest_macro = { path = "../googletest_macro", version = "0.1.0" }
+googletest_macro = { path = "../googletest_macro", version = "0.2.0" }
 num-traits = "0.2.15"
 regex = "1.6.0"
 

googletest/integration_tests/assertion_failure_in_subroutine.rs

@@ -12,21 +12,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[cfg(not(google3))]
-use googletest::matchers;
-use googletest::{verify_that, Result};
-use googletest_macro::google_test_wrapper;
-use matchers::eq;
+fn main() {}
 
-fn main() -> std::result::Result<(), ()> {
-    should_fail_in_subroutine()
-}
+#[cfg(test)]
+mod tests {
+    #[cfg(not(google3))]
+    use googletest::matchers;
+    use googletest::{google_test, verify_that, Result};
+    use matchers::eq;
 
-#[google_test_wrapper]
-fn should_fail_in_subroutine() -> Result<()> {
-    assert_that_things_are_okay(2)
-}
+    #[google_test]
+    fn should_fail_in_subroutine() -> Result<()> {
+        assert_that_things_are_okay(2)
+    }
 
-fn assert_that_things_are_okay(value: i32) -> Result<()> {
-    verify_that!(value, eq(3))
+    fn assert_that_things_are_okay(value: i32) -> Result<()> {
+        verify_that!(value, eq(3))
+    }
 }

googletest/integration_tests/custom_error_message.rs

@@ -12,33 +12,31 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[cfg(not(google3))]
-use googletest::matchers;
-use googletest::{verify_that, GoogleTestSupport, Result};
-use googletest_macro::google_test_wrapper;
-use matchers::eq;
+fn main() {}
 
-fn main() {
-    let _ = should_fail_with_custom_error_message();
-    let _ = should_fail_with_custom_error_message_in_string();
-    let _ = should_fail_with_custom_error_message_in_closure();
-}
+#[cfg(test)]
+mod tests {
+    #[cfg(not(google3))]
+    use googletest::matchers;
+    use googletest::{verify_that, GoogleTestSupport, Result};
+    use matchers::eq;
 
-#[google_test_wrapper]
-fn should_fail_with_custom_error_message() -> Result<()> {
-    let value = 2;
-    verify_that!(value, eq(3)).failure_message("A custom error message")
-}
+    #[test]
+    fn should_fail_with_custom_error_message() -> Result<()> {
+        let value = 2;
+        verify_that!(value, eq(3)).failure_message("A custom error message")
+    }
 
-#[google_test_wrapper]
-fn should_fail_with_custom_error_message_in_string() -> Result<()> {
-    let value = 2;
-    verify_that!(value, eq(3)).failure_message("A custom error message in a String".to_string())
-}
+    #[test]
+    fn should_fail_with_custom_error_message_in_string() -> Result<()> {
+        let value = 2;
+        verify_that!(value, eq(3)).failure_message("A custom error message in a String".to_string())
+    }
 
-#[google_test_wrapper]
-fn should_fail_with_custom_error_message_in_closure() -> Result<()> {
-    let value = 2;
-    verify_that!(value, eq(3))
-        .with_failure_message(|| "A custom error message from a closure".to_string())
+    #[test]
+    fn should_fail_with_custom_error_message_in_closure() -> Result<()> {
+        let value = 2;
+        verify_that!(value, eq(3))
+            .with_failure_message(|| "A custom error message from a closure".to_string())
+    }
 }

googletest/integration_tests/failure_due_to_fail_macro.rs

@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use googletest::{fail, Result};
-use googletest_macro::google_test_wrapper;
+fn main() {}
 
-fn main() -> std::result::Result<(), ()> {
-    just_fails()
-}
+#[cfg(test)]
+mod tests {
+    use googletest::{fail, Result};
 
-#[google_test_wrapper]
-fn just_fails() -> Result<()> {
-    fail!("Expected test failure")
+    #[test]
+    fn just_fails() -> Result<()> {
+        fail!("Expected test failure")
+    }
 }

googletest/integration_tests/failure_due_to_fail_macro_with_empty_message.rs

@@ -12,12 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use googletest::{fail, GoogleTestSupport};
+fn main() {}
 
-fn main() {
-    just_fails();
-}
+#[cfg(test)]
+mod tests {
+    use googletest::{fail, google_test, GoogleTestSupport, Result};
 
-fn just_fails() {
-    fail!().and_log_failure();
+    #[google_test]
+    fn just_fails() -> Result<()> {
+        fail!().and_log_failure();
+        Ok(())
+    }
 }

googletest/integration_tests/failure_due_to_fail_macro_with_format_arguments.rs

@@ -12,12 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use googletest::{fail, GoogleTestSupport};
+fn main() {}
 
-fn main() {
-    just_fails();
-}
+#[cfg(test)]
+mod tests {
+    use googletest::{fail, google_test, GoogleTestSupport, Result};
 
-fn just_fails() {
-    fail!("Failure message with argument: {}", "An argument").and_log_failure();
+    #[google_test]
+    fn just_fails() -> Result<()> {
+        fail!("Failure message with argument: {}", "An argument").and_log_failure();
+        Ok(())
+    }
 }

googletest/integration_tests/failure_due_to_returned_error.rs

@@ -12,13 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use googletest_macro::google_test_wrapper;
+fn main() {}
 
-fn main() -> Result<(), ()> {
-    should_fail_due_to_returned_error()
-}
+#[cfg(test)]
+mod tests {
+    use googletest::google_test;
 
-#[google_test_wrapper]
-fn should_fail_due_to_returned_error() -> Result<(), i32> {
-    Err(123)
+    #[google_test]
+    fn should_fail_due_to_returned_error() -> Result<(), i32> {
+        Err(123)
+    }
 }

googletest/integration_tests/first_failure_aborts.rs

@@ -12,20 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[cfg(not(google3))]
-use googletest::matchers;
-use googletest::{verify_that, GoogleTestSupport, Result};
-use googletest_macro::google_test_wrapper;
-use matchers::eq;
+fn main() {}
 
-fn main() {
-    let _ = first_failure_aborts();
-}
+#[cfg(test)]
+mod tests {
+    #[cfg(not(google3))]
+    use googletest::matchers;
+    use googletest::{google_test, verify_that, GoogleTestSupport, Result};
+    use matchers::eq;
 
-#[google_test_wrapper]
-fn first_failure_aborts() -> Result<()> {
-    let value = 2;
-    verify_that!(value, eq(3))?;
-    verify_that!(value, eq(4)).and_log_failure();
-    Ok(())
+    #[google_test]
+    fn first_failure_aborts() -> Result<()> {
+        let value = 2;
+        verify_that!(value, eq(3))?;
+        verify_that!(value, eq(4)).and_log_failure();
+        Ok(())
+    }
 }

googletest/integration_tests/integration_tests.rs

@@ -24,7 +24,7 @@ mod tests {
     use googletest_macro::google_test_wrapper;
     #[cfg(google3)]
     use matchers::all;
-    use matchers::{contains_regex, contains_substring, eq, matches_regex, not};
+    use matchers::{contains_regex, contains_substring, eq, not};
     use std::process::Command;
 
     #[google_test]
@@ -356,10 +356,10 @@ a_submodule :: A_STRUCT_IN_SUBMODULE.eq_predicate_as_method(a, b) was false with
 
         verify_that!(
             output,
-            matches_regex(
+            contains_regex(
                 "\
 Expected test failure
-  at .*googletest/integration_tests/failure_due_to_fail_macro.rs:[0-9]+:5
+  at .*googletest/integration_tests/failure_due_to_fail_macro.rs:[0-9]+:9
 "
             )
         )