Merge pull request #341 from google:support-trailing-comma-in-top-level-macros

PiperOrigin-RevId: 591831810

Author: copybara-github

googletest/src/assertions.rs

@@ -136,7 +136,7 @@ macro_rules! verify_that {
             $crate::internal::source_location::SourceLocation::new(file!(), line!(), column!()),
         )
     };
-    ($actual:expr, $expected:expr) => {
+    ($actual:expr, $expected:expr $(,)?) => {
         $crate::assertions::internal::check_matcher(
             &$actual,
             $expected,
@@ -351,7 +351,7 @@ macro_rules! fail {
 /// equivalent to `ASSERT_THAT`, use [`verify_that!`] with the `?` operator.
 #[macro_export]
 macro_rules! assert_that {
-    ($actual:expr, $expected:expr) => {
+    ($actual:expr, $expected:expr $(,)?) => {
         match $crate::verify_that!($actual, $expected) {
             Ok(_) => {}
             Err(e) => {
@@ -442,7 +442,7 @@ macro_rules! assert_pred {
 /// ```
 #[macro_export]
 macro_rules! expect_that {
-    ($actual:expr, $expected:expr) => {{
+    ($actual:expr, $expected:expr $(,)?) => {{
         use $crate::GoogleTestSupport;
         $crate::verify_that!($actual, $expected).and_log_failure();
     }};

integration_tests/src/integration_tests.rs

@@ -26,6 +26,12 @@ mod tests {
         verify_that!(value, eq(2))
     }
 
+    #[test]
+    fn verify_that_supports_trailing_comma() -> Result<()> {
+        let value = 2;
+        verify_that!(value, eq(2),)
+    }
+
     #[test]
     fn should_pass_with_omitted_elements_are() -> Result<()> {
         verify_that!(vec![1, 2], [eq(1), eq(2)])
@@ -48,10 +54,21 @@ mod tests {
     }
 
     #[test]
-    fn should_pass_with_assert_that() -> Result<()> {
+    fn should_pass_with_assert_that() {
         let value = 2;
         assert_that!(value, eq(2));
-        Ok(())
+    }
+
+    #[test]
+    fn assert_that_supports_trailing_comma() {
+        let value = 2;
+        assert_that!(value, eq(2),);
+    }
+
+    #[test]
+    fn assert_that_with_custom_failure_message_supports_trailing_comma() {
+        let value = 2;
+        assert_that!(value, eq(2), "A custom error message",);
     }
 
     #[googletest::test]
@@ -67,6 +84,18 @@ mod tests {
         expect_that!(value, eq(2));
     }
 
+    #[googletest::test]
+    fn expect_that_supports_trailing_comma() {
+        let value = 2;
+        expect_that!(value, eq(2),);
+    }
+
+    #[googletest::test]
+    fn expect_that_with_custom_failure_message_supports_trailing_comma() {
+        let value = 2;
+        expect_that!(value, eq(2), "A custom error message",);
+    }
+
     #[test]
     fn should_fail_on_assertion_failure() -> Result<()> {
         let status = run_external_process("simple_assertion_failure").status()?;