Fix the tests on Rust nightly.

A recent change in Rust caused minor formatting changes when displaying fully qualified enum variants. Namely:
* The spaces around the `::` which were previously present were removed.
* The space between `vec!` and the vector content was removed.
This breaks tests which assert descriptions, match explanations, and failure messages. These rely on the `Debug` representation of actual and expected values.

This fixes the tests so that they pass again in nightly while continuing to pass in the other versions. It removes text from the assertion where it is not crucial to what is being tested. In cases where it is crucial, either the critical part is extracted to a variable which is set according to the Rust version, or the test itself is duplicated and adjusted according to the Rust version.

Author: hovinen

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`
             "
@@ -411,7 +409,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 +422,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]
@@ -451,6 +449,11 @@ fn does_not_match_wrong_enum_value() -> Result<()> {
     verify_that!(actual, not(matches_pattern!(AnEnum::A(eq(123)))))
 }
 
+#[rustversion::all(not(nightly), before(1.76))]
+const ANENUM_A_REPR: &str = "AnEnum :: A";
+#[rustversion::any(nightly, since(1.76))]
+const ANENUM_A_REPR: &str = "AnEnum::A";
+
 #[test]
 fn includes_enum_variant_in_description_with_field() -> Result<()> {
     #[derive(Debug)]
@@ -463,7 +466,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 +484,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 +502,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 +520,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 +538,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 +559,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::all(not(nightly), 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::any(nightly, 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()?;