Merge pull request #339 from google:fix-for-nightly

PiperOrigin-RevId: 591267784

Author: copybara-github

googletest/src/matchers/each_matcher.rs

@@ -238,7 +238,6 @@ mod tests {
             result,
             err(displays_as(contains_substring(indoc!(
                 "
-                Value of: vec![vec! [1, 2], vec! [1]]
                 Expected: only contains elements that only contains elements that is equal to 1
                 Actual: [[1, 2], [1]],
                   whose element #0 is [1, 2], whose element #1 is 2, which isn't equal to 1"

googletest/tests/elements_are_matcher_test.rs

@@ -82,7 +82,6 @@ fn elements_are_produces_correct_failure_message_nested() -> Result<()> {
         result,
         err(displays_as(contains_substring(indoc!(
             "
-                Value of: vec![vec! [0, 1], vec! [1, 2]]
                 Expected: has elements:
                   0. has elements:
                        0. is equal to 1

googletest/tests/matches_pattern_test.rs

@@ -202,8 +202,6 @@ fn has_meaningful_assertion_failure_message_when_wrong_enum_variant_is_used() ->
     verify_that!(
         result,
         err(displays_as(contains_substring(indoc! {"
-            Value of: actual
-            Expected: is AnEnum :: B which has field `0`, which is equal to 123
             Actual: A(123),
               which has the wrong enum variant `A`
             "
@@ -399,6 +397,12 @@ fn matches_enum_without_field() -> Result<()> {
     verify_that!(actual, matches_pattern!(AnEnum::A))
 }
 
+#[rustversion::before(1.76)]
+const ANENUM_A_REPR: &str = "AnEnum :: A";
+
+#[rustversion::since(1.76)]
+const ANENUM_A_REPR: &str = "AnEnum::A";
+
 #[test]
 fn generates_correct_failure_output_when_enum_variant_without_field_is_not_matched() -> Result<()> {
     #[derive(Debug)]
@@ -411,7 +415,7 @@ fn generates_correct_failure_output_when_enum_variant_without_field_is_not_match
 
     let result = verify_that!(actual, matches_pattern!(AnEnum::A));
 
-    verify_that!(result, err(displays_as(contains_substring("is not AnEnum :: A"))))
+    verify_that!(result, err(displays_as(contains_substring(format!("is not {ANENUM_A_REPR}")))))
 }
 
 #[test]
@@ -424,7 +428,7 @@ fn generates_correct_failure_output_when_enum_variant_without_field_is_matched()
 
     let result = verify_that!(actual, not(matches_pattern!(AnEnum::A)));
 
-    verify_that!(result, err(displays_as(contains_substring("is AnEnum :: A"))))
+    verify_that!(result, err(displays_as(contains_substring(format!("is {ANENUM_A_REPR}")))))
 }
 
 #[test]
@@ -463,7 +467,9 @@ fn includes_enum_variant_in_description_with_field() -> Result<()> {
 
     verify_that!(
         result,
-        err(displays_as(contains_substring("Expected: is AnEnum :: A which has field `0`")))
+        err(displays_as(contains_substring(format!(
+            "Expected: is {ANENUM_A_REPR} which has field `0`"
+        ))))
     )
 }
 
@@ -479,9 +485,9 @@ fn includes_enum_variant_in_negative_description_with_field() -> Result<()> {
 
     verify_that!(
         result,
-        err(displays_as(contains_substring(
-            "Expected: is not AnEnum :: A which has field `0`, which is equal to"
-        )))
+        err(displays_as(contains_substring(format!(
+            "Expected: is not {ANENUM_A_REPR} which has field `0`, which is equal to"
+        ))))
     )
 }
 
@@ -497,9 +503,9 @@ fn includes_enum_variant_in_description_with_two_fields() -> Result<()> {
 
     verify_that!(
         result,
-        err(displays_as(contains_substring(
-            "Expected: is AnEnum :: A which has all the following properties"
-        )))
+        err(displays_as(contains_substring(format!(
+            "Expected: is {ANENUM_A_REPR} which has all the following properties"
+        ))))
     )
 }
 
@@ -515,9 +521,9 @@ fn includes_enum_variant_in_description_with_three_fields() -> Result<()> {
 
     verify_that!(
         result,
-        err(displays_as(contains_substring(
-            "Expected: is AnEnum :: A which has all the following properties"
-        )))
+        err(displays_as(contains_substring(format!(
+            "Expected: is {ANENUM_A_REPR} which has all the following properties"
+        ))))
     )
 }
 
@@ -533,7 +539,9 @@ fn includes_enum_variant_in_description_with_named_field() -> Result<()> {
 
     verify_that!(
         result,
-        err(displays_as(contains_substring("Expected: is AnEnum :: A which has field `field`")))
+        err(displays_as(contains_substring(format!(
+            "Expected: is {ANENUM_A_REPR} which has field `field`"
+        ))))
     )
 }
 
@@ -552,9 +560,9 @@ fn includes_enum_variant_in_description_with_two_named_fields() -> Result<()> {
 
     verify_that!(
         result,
-        err(displays_as(contains_substring(
-            "Expected: is AnEnum :: A which has all the following properties"
-        )))
+        err(displays_as(contains_substring(format!(
+            "Expected: is {ANENUM_A_REPR} which has all the following properties"
+        ))))
     )
 }
 

integration_tests/Cargo.toml

@@ -32,6 +32,7 @@ googletest = { path = "../googletest", version = "0.10.0", features = ["anyhow"]
 anyhow = "1"
 indoc = "2"
 rstest = "0.18"
+rustversion = "1.0.14"
 tokio = { version = "1.34", features = ["time", "macros", "rt"] }
 
 [[bin]]

integration_tests/src/integration_tests.rs

@@ -474,6 +474,7 @@ mod tests {
     }
 
     #[test]
+    #[rustversion::before(1.76)]
     fn verify_pred_should_show_correct_qualified_function_name_in_test_failure_output() -> Result<()>
     {
         let output = run_external_process_in_tests_directory(
@@ -490,6 +491,24 @@ mod tests {
         )
     }
 
+    #[test]
+    #[rustversion::since(1.76)]
+    fn verify_pred_should_show_correct_qualified_function_name_in_test_failure_output() -> Result<()>
+    {
+        let output = run_external_process_in_tests_directory(
+            "verify_predicate_with_failure_as_method_in_submodule",
+        )?;
+
+        verify_that!(
+            output,
+            contains_substring(indoc! {"
+                a_submodule::A_STRUCT_IN_SUBMODULE.eq_predicate_as_method(a, b) was false with
+                  a = 1,
+                  b = 2
+                "})
+        )
+    }
+
     #[test]
     fn fail_macro_causes_test_failure() -> Result<()> {
         let status = run_external_process("failure_due_to_fail_macro").status()?;