Support sequences and sets in expect_that!.

This adds additional patterns to match the sequences and sets in `expect_that`, so that the macro can delegate those cases to `verify_that!`, which knows how to work with those arguments.

PiperOrigin-RevId: 694604266

googletest/src/assertions.rs

@@ -1361,12 +1361,43 @@ macro_rules! assert_pred {
 /// ```
 #[macro_export]
 macro_rules! expect_that {
+    // specialized to sequence:
+    ($actual:expr, [$($expected:expr),*] $(,)?) => {{
+        use $crate::GoogleTestSupport as _;
+        $crate::verify_that!($actual, [$($expected),*]).and_log_failure();
+    }};
+
+    // specialized to unordered sequence:
+    ($actual:expr, {$($expected:expr),*} $(,)?) => {{
+        use $crate::GoogleTestSupport as _;
+        $crate::verify_that!($actual, {$($expected),*}).and_log_failure();
+    }};
+
+    // general case:
     ($actual:expr, $expected:expr $(,)?) => {{
         use $crate::GoogleTestSupport as _;
         $crate::verify_that!($actual, $expected).and_log_failure();
     }};
 
+    // w/ format args, specialized to sequence:
+    ($actual:expr, [$($expected:expr),*], $($format_args:expr),* $(,)?) => {
+        use $crate::GoogleTestSupport as _;
+        $crate::verify_that!($actual, [$($expected),*])
+            .with_failure_message(|| format!($($format_args),*))
+            .and_log_failure()
+    };
+
+    // w/ format args, specialized to unordered sequence:
+    ($actual:expr, {$($expected:expr),*}, $($format_args:expr),* $(,)?) => {
+        use $crate::GoogleTestSupport as _;
+        $crate::verify_that!($actual, {$($expected),*})
+            .with_failure_message(|| format!($($format_args),*))
+            .and_log_failure()
+    };
+
+    // w/ format args, general case:
     ($actual:expr, $expected:expr, $($format_args:expr),* $(,)?) => {
+        use $crate::GoogleTestSupport as _;
         $crate::verify_that!($actual, $expected)
             .with_failure_message(|| format!($($format_args),*))
             .and_log_failure()

integration_tests/src/integration_tests.rs

@@ -96,6 +96,16 @@ mod tests {
         expect_that!(value, eq(2), "A custom error message",);
     }
 
+    #[gtest]
+    fn expect_that_with_omitted_elements_are() {
+        expect_that!(vec![1, 2], [eq(&1), eq(&2)]);
+    }
+
+    #[gtest]
+    fn expect_that_with_omitted_elements_supports_custom_error_msg() {
+        expect_that!(vec![1, 2], [eq(&1), eq(&2)], "A custom error message");
+    }
+
     #[gtest]
     fn should_fail_on_assertion_failure() -> Result<()> {
         let status = run_external_process("simple_assertion_failure").status()?;