Add ability to pass failure message and formatting args to expect_true and expect_false macros.

Also, added integration tests to verify failure messages.

PiperOrigin-RevId: 736809149

Author: Googler

googletest/src/assertions.rs

@@ -489,6 +489,11 @@ macro_rules! expect_true {
     ($condition:expr) => {{
         $crate::GoogleTestSupport::and_log_failure($crate::verify_true!($condition))
     }};
+    ($condition:expr, $($format_args:expr),* $(,)?) => {{
+        $crate::GoogleTestSupport::and_log_failure($crate::verify_true!($condition)
+            .with_failure_message(|| format!($($format_args),*))
+            );
+    }};
 }
 pub use expect_true;
 
@@ -550,6 +555,11 @@ macro_rules! expect_false {
     ($condition:expr) => {{
         $crate::GoogleTestSupport::and_log_failure(($crate::verify_false!($condition)))
     }};
+    ($condition:expr, $($format_args:expr),* $(,)?) => {{
+        $crate::GoogleTestSupport::and_log_failure($crate::verify_false!($condition)
+            .with_failure_message(|| format!($($format_args),*))
+            );
+    }};
 }
 pub use expect_false;
 

integration_tests/Cargo.toml

@@ -430,3 +430,13 @@ test = false
 name = "abbreviated_stringify_macro"
 path = "src/abbreviated_stringify_macro.rs"
 test = false
+
+[[bin]]
+name = "expect_false_macro_on_true_condition_with_format_args"
+path = "src/expect_false_macro_on_true_condition_with_format_args.rs"
+test = false
+
+[[bin]]
+name = "expect_true_macro_on_false_condition_with_format_args"
+path = "src/expect_true_macro_on_false_condition_with_format_args.rs"
+test = false

integration_tests/src/expect_false_macro_on_true_condition_with_format_args.rs

@@ -0,0 +1,27 @@
+// Copyright 2024 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+fn main() {}
+
+#[cfg(test)]
+mod tests {
+    use googletest::prelude::*;
+
+    #[gtest]
+    fn should_fail() {
+        let extra_information = "extra information";
+
+        expect_false!(1 == 1, "expected false: {extra_information}")
+    }
+}

integration_tests/src/expect_true_macro_on_false_condition_with_format_args.rs

@@ -0,0 +1,27 @@
+// Copyright 2024 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+fn main() {}
+
+#[cfg(test)]
+mod tests {
+    use googletest::prelude::*;
+
+    #[gtest]
+    fn should_fail() {
+        let extra_information = "extra information";
+
+        expect_true!(1 == 2, "expected true: {extra_information}")
+    }
+}

integration_tests/src/integration_tests.rs

@@ -2025,6 +2025,26 @@ mod tests {
         )
     }
 
+    #[gtest]
+    fn expect_false_macro_on_true_condition_with_format_args_logs_error_when_handled() -> Result<()>
+    {
+        let output = run_external_process_in_tests_directory(
+            "expect_false_macro_on_true_condition_with_format_args",
+        )?;
+
+        verify_that!(output, contains_substring(indoc! {"expected false: extra information"}))
+    }
+
+    #[gtest]
+    fn expect_true_macro_on_false_condition_with_format_args_logs_error_when_handled() -> Result<()>
+    {
+        let output = run_external_process_in_tests_directory(
+            "expect_true_macro_on_false_condition_with_format_args",
+        )?;
+
+        verify_that!(output, contains_substring(indoc! {"expected true: extra information"}))
+    }
+
     fn run_external_process_in_tests_directory_with_args(
         name: &'static str,
         args: &[&'static str],

run_integration_tests.sh

@@ -101,6 +101,8 @@ INTEGRATION_TEST_BINARIES=(
   "macro_hygiene"
   "expect_panic"
   "expect_panic_with_expected"
+  "expect_false_macro_on_true_condition_with_format_args"
+  "expect_true_macro_on_false_condition_with_format_args"
 )
 
 cargo build