Remove the assert_ versions for macros since the preference if for using

`verify_` and `expect_`

PiperOrigin-RevId: 651889994

Author: satylogin

googletest/src/assertions.rs

@@ -449,31 +449,6 @@ macro_rules! verify_true {
     }};
 }
 
-/// Assert if the condition evaluates to true and panics if false.
-///
-/// This is the same as calling `and_log_failure` on [`verify_true`] macro
-/// Result.
-///
-/// This can only be invoked inside tests with the
-/// [`googletest::test`][crate::test] attribute. The failure must be generated
-/// in the same thread as that running the test itself.
-///
-/// Example:
-/// ```ignore
-/// use googletest::prelude::*;
-///
-/// #[googletest::test]
-/// fn should_fail() {
-///     assert_true!(2 + 2 == 5);
-/// }
-/// ```
-#[macro_export]
-macro_rules! assert_true {
-    ($condition:expr) => {
-        verify_true!($condition).and_log_failure()
-    };
-}
-
 /// Marks test as failed and continue execution if the expression evaluates to
 /// false.
 ///
@@ -534,31 +509,6 @@ macro_rules! verify_false {
     }};
 }
 
-/// Assert if the condition evaluates to false and panics if true.
-///
-/// This is the same as calling `and_log_failure` on [`verify_false`] macro
-/// Result.
-///
-/// This can only be invoked inside tests with the
-/// [`googletest::test`][crate::test] attribute. The failure must be generated
-/// in the same thread as that running the test itself.
-///
-/// Example:
-/// ```ignore
-/// use googletest::prelude::*;
-///
-/// #[googletest::test]
-/// fn should_fail() {
-///     assert_false!(2 + 2 == 4);
-/// }
-/// ```
-#[macro_export]
-macro_rules! assert_false {
-    ($condition:expr) => {
-        verify_false!($condition).and_log_failure()
-    };
-}
-
 /// Marks test as failed and continue execution if the expression evaluates to
 /// true.
 ///
@@ -631,68 +581,6 @@ macro_rules! verify_eq {
     };
 }
 
-/// Panics if the second argument is not equal to first argument.
-///
-/// This is the same as calling `and_log_failure` on [`verify_eq`] macro Result.
-///
-/// This can only be invoked inside tests with the
-/// [`googletest::test`][crate::test] attribute. The failure must be generated
-/// in the same thread as that running the test itself.
-///
-/// Example:
-/// ```ignore
-/// use googletest;
-///
-/// #[googletest::test]
-/// fn should_fail() {
-///     googletest::assert_eq!(2, 1);
-/// }
-/// ```
-///
-/// This macro has special support for matching against container. Namely:
-///  * `assert_eq!(actual, [e1, e2, ...])` for checking actual contains "e1, e2,
-///    ..." in order.
-///  * `assert_eq!(actual, {e1, e2, ...})` for checking actual contains "e1, e2,
-///    ..." in any order.
-///
-/// One may include formatted arguments in the failure message:
-///```ignore
-/// use googletest;
-///
-/// #[googletest::test]
-/// fn should_fail() {
-///     let argument = "argument"
-///     googletest::assert_eq!(2, 1, "custom failure message: {argument}");
-/// }
-/// ```
-#[macro_export]
-macro_rules! assert_eq {
-    ($actual:expr, [$($expected:expr),+ $(,)?] $(,)?) => {
-        verify_eq!($actual, [$($expected),*]).and_log_failure();
-    };
-    ($actual:expr, [$($expected:expr),+ $(,)?], $($format_args:expr),* $(,)?) => {
-        verify_eq!($actual, [$($expected),*])
-            .with_failure_message(|| format!($($format_args),*))
-            .and_log_failure();
-    };
-    ($actual:expr, {$($expected:expr),+ $(,)?} $(,)?) => {
-        verify_eq!($actual, {$($expected),*}).and_log_failure();
-    };
-    ($actual:expr, {$($expected:expr),+ $(,)?}, $($format_args:expr),* $(,)?) => {
-        verify_eq!($actual, {$($expected),*})
-            .with_failure_message(|| format!($($format_args),*))
-            .and_log_failure();
-    };
-    ($actual:expr, $expected:expr $(,)?) => {
-        verify_eq!($actual, $expected).and_log_failure();
-    };
-    ($actual:expr, $expected:expr, $($format_args:expr),* $(,)?) => {
-        verify_eq!($actual, $expected)
-            .with_failure_message(|| format!($($format_args),*))
-            .and_log_failure();
-    };
-}
-
 /// Marks test as failed and continues execution if the second argument is not
 /// equal to first argument.
 ///

googletest/src/lib.rs

@@ -50,10 +50,10 @@ pub mod prelude {
     pub use super::Result;
     // Assert macros
     pub use super::{
-        add_failure, add_failure_at, assert_false, assert_that, assert_true, expect_eq,
-        expect_false, expect_ge, expect_gt, expect_le, expect_lt, expect_ne, expect_pred,
-        expect_that, expect_true, fail, succeed, verify_eq, verify_false, verify_ge, verify_gt,
-        verify_le, verify_lt, verify_ne, verify_pred, verify_that, verify_true,
+        add_failure, add_failure_at, assert_that, expect_eq, expect_false, expect_ge, expect_gt,
+        expect_le, expect_lt, expect_ne, expect_pred, expect_that, expect_true, fail, succeed,
+        verify_eq, verify_false, verify_ge, verify_gt, verify_le, verify_lt, verify_ne,
+        verify_pred, verify_that, verify_true,
     };
 }
 

integration_tests/Cargo.toml

@@ -150,11 +150,6 @@ name = "verify_true_macro_on_false_condition"
 path = "src/verify_true_macro_on_false_condition.rs"
 test = false
 
-[[bin]]
-name = "assert_true_macro_on_false_condition_panics"
-path = "src/assert_true_macro_on_false_condition_panics.rs"
-test = false
-
 [[bin]]
 name = "expect_true_macro_on_false_condition_fails_test_and_continues"
 path = "src/expect_true_macro_on_false_condition_fails_test_and_continues.rs"
@@ -165,11 +160,6 @@ name = "verify_false_macro_on_true_condition"
 path = "src/verify_false_macro_on_true_condition.rs"
 test = false
 
-[[bin]]
-name = "assert_false_macro_on_true_condition_panics"
-path = "src/assert_false_macro_on_true_condition_panics.rs"
-test = false
-
 [[bin]]
 name = "expect_false_macro_on_true_condition_fails_test_and_continues"
 path = "src/expect_false_macro_on_true_condition_fails_test_and_continues.rs"
@@ -190,36 +180,6 @@ name = "verify_eq_with_unordered_elements_when_not_equal_returns_error"
 path = "src/verify_eq_with_unordered_elements_when_not_equal_returns_error.rs"
 test = false
 
-[[bin]]
-name = "assert_eq_when_not_equal_returns_error"
-path = "src/assert_eq_when_not_equal_returns_error.rs"
-test = false
-
-[[bin]]
-name = "assert_eq_supports_custom_message"
-path = "src/assert_eq_supports_custom_message.rs"
-test = false
-
-[[bin]]
-name = "assert_eq_with_ordered_elements_when_not_equal_returns_error"
-path = "src/assert_eq_with_ordered_elements_when_not_equal_returns_error.rs"
-test = false
-
-[[bin]]
-name = "assert_eq_with_ordered_elements_supports_custom_message"
-path = "src/assert_eq_with_ordered_elements_supports_custom_message.rs"
-test = false
-
-[[bin]]
-name = "assert_eq_with_unordered_elements_when_not_equal_returns_error"
-path = "src/assert_eq_with_unordered_elements_when_not_equal_returns_error.rs"
-test = false
-
-[[bin]]
-name = "assert_eq_with_unordered_elements_supports_custom_message"
-path = "src/assert_eq_with_unordered_elements_supports_custom_message.rs"
-test = false
-
 [[bin]]
 name = "expect_eq_when_not_equal_returns_error"
 path = "src/expect_eq_when_not_equal_returns_error.rs"