From ebec1432358f5c60e9d7cdd131ca037f0841ac26 Mon Sep 17 00:00:00 2001 From: haraldmaida Date: Sat, 8 Nov 2025 09:20:33 +0100 Subject: [PATCH] feat: remove phrase "assertion failed: " from the message of failing assertions --- examples/colored_diffs.png | Bin 34083 -> 9691 bytes src/bigdecimal/tests.rs | 14 +- src/boolean/tests.rs | 14 +- src/char/tests.rs | 96 +++---- src/colored/tests.rs | 2 +- src/error/tests.rs | 24 +- src/expectation_combinators/tests.rs | 24 +- src/float/tests.rs | 50 ++-- src/integer/tests.rs | 22 +- src/iterator/tests.rs | 8 +- src/lib.rs | 8 +- src/map/tests.rs | 88 +++---- src/num_bigint/tests.rs | 4 +- src/option/mod.rs | 4 +- src/option/tests.rs | 32 ++- src/order/tests.rs | 62 ++--- src/panic/tests.rs | 35 ++- src/predicate/tests.rs | 7 +- src/range/tests.rs | 120 +++------ src/result/mod.rs | 12 +- src/result/tests.rs | 56 ++--- src/rust_decimal/tests.rs | 12 +- src/slice/tests.rs | 112 ++++----- src/spec/mod.rs | 30 +-- src/spec/tests.rs | 39 ++- src/string/tests.rs | 358 ++++++++++----------------- src/vec/tests.rs | 60 ++--- 27 files changed, 520 insertions(+), 773 deletions(-) diff --git a/examples/colored_diffs.png b/examples/colored_diffs.png index 11cc1797d550bddb0c6dee98586e58189977c17f..7087e31c3a4c083ea245b8e6a11a6c5b684cfce6 100644 GIT binary patch literal 9691 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 PwGb3#Rb{HBOoRUiA^h(g literal 34083 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 R22tU4LQYvW_2_TE|1X3ABW(Zx diff --git a/src/bigdecimal/tests.rs b/src/bigdecimal/tests.rs index 8f4e80d..c56ecc9 100644 --- a/src/bigdecimal/tests.rs +++ b/src/bigdecimal/tests.rs @@ -27,7 +27,7 @@ fn verify_bigdecimal_is_equal_to_other_fails() { assert_eq!( failures, &[ - r"assertion failed: expected subject to be equal to BigDecimal(sign=Minus, scale=3, digits=[42831]) + r"expected subject to be equal to BigDecimal(sign=Minus, scale=3, digits=[42831]) but was: BigDecimal(sign=Plus, scale=3, digits=[42831]) expected: BigDecimal(sign=Minus, scale=3, digits=[42831]) " @@ -181,7 +181,7 @@ fn verify_bigdecimalref_is_equal_to_other_fails() { assert_eq!( failures, &[ - r"assertion failed: expected subject to be equal to BigDecimalRef { sign: Minus, digits: 42831, scale: 3 } + r"expected subject to be equal to BigDecimalRef { sign: Minus, digits: 42831, scale: 3 } but was: BigDecimalRef { sign: Plus, digits: 42831, scale: 3 } expected: BigDecimalRef { sign: Minus, digits: 42831, scale: 3 } " @@ -264,12 +264,10 @@ fn verify_bigdecimal_has_precision_of_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected subject to have a precision of 7 + &[r"expected subject to have a precision of 7 but was: 9 expected: 7 -" - ] +"] ); } @@ -299,7 +297,7 @@ fn verify_bigdecimal_has_scale_of_fails() { assert_eq!( failures, - &[r"assertion failed: expected subject to have a scale of 5 + &[r"expected subject to have a scale of 5 but was: 2 expected: 5 "] @@ -335,7 +333,7 @@ fn verify_bigdecimal_is_integer_fails() { assert_eq!( failures, - &[r"assertion failed: expected subject to be an integer value + &[r"expected subject to be an integer value but was: BigDecimal(sign=Plus, scale=2, digits=[420810]) expected: an integer value "] diff --git a/src/boolean/tests.rs b/src/boolean/tests.rs index e9d15c7..afa9bd7 100644 --- a/src/boolean/tests.rs +++ b/src/boolean/tests.rs @@ -23,12 +23,10 @@ fn verify_bool_is_not_equal_to_false_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to be not equal to false + &[r"expected my_thing to be not equal to false but was: false expected: not false -" - ] +"] ); } @@ -49,7 +47,7 @@ fn verify_bool_is_true_fails() { .named("my_thing") .is_true() .display_failures(), - &[r"assertion failed: expected my_thing to be true + &[r"expected my_thing to be true but was: false expected: true "] @@ -65,7 +63,7 @@ fn verify_bool_is_false_fails() { assert_eq!( failures, - &[r"assertion failed: expected my_thing to be false + &[r"expected my_thing to be false but was: true expected: false "] @@ -85,7 +83,7 @@ mod colored { assert_eq!( failures, - &["assertion failed: expected subject to be true\n \ + &["expected subject to be true\n \ but was: \u{1b}[31mfalse\u{1b}[0m\n \ expected: \u{1b}[32mtrue\u{1b}[0m\n\ "] @@ -101,7 +99,7 @@ mod colored { assert_eq!( failures, - &["assertion failed: expected subject to be false\n \ + &["expected subject to be false\n \ but was: \u{1b}[31mtrue\u{1b}[0m\n \ expected: \u{1b}[33mfalse\u{1b}[0m\n\ "] diff --git a/src/char/tests.rs b/src/char/tests.rs index 9bbe2f0..8899b35 100644 --- a/src/char/tests.rs +++ b/src/char/tests.rs @@ -12,7 +12,7 @@ fn verify_char_is_lowercase_fails() { assert_eq!( failures, - &[r"assertion failed: expected subject to be lowercase + &[r"expected subject to be lowercase but was: M expected: m "] @@ -30,7 +30,7 @@ fn verify_borrowed_char_is_lowercase_fails() { assert_eq!( failures, - &[r"assertion failed: expected subject to be lowercase + &[r"expected subject to be lowercase but was: M expected: m "] @@ -48,7 +48,7 @@ fn verify_char_is_uppercase_fails() { assert_eq!( failures, - &[r"assertion failed: expected subject to be uppercase + &[r"expected subject to be uppercase but was: k expected: K "] @@ -66,7 +66,7 @@ fn verify_borrowed_char_is_uppercase_fails() { assert_eq!( failures, - &[r"assertion failed: expected subject to be uppercase + &[r"expected subject to be uppercase but was: x expected: X "] @@ -84,12 +84,10 @@ fn verify_char_is_ascii_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected subject to be an ASCII character + &[r"expected subject to be an ASCII character but was: € expected: an ASCII character -" - ] +"] ); } @@ -104,12 +102,10 @@ fn verify_borrowed_char_is_ascii_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected subject to be an ASCII character + &[r"expected subject to be an ASCII character but was: ❤ expected: an ASCII character -" - ] +"] ); } @@ -124,12 +120,10 @@ fn verify_char_is_alphabetic_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected subject to be an alphabetic character + &[r"expected subject to be an alphabetic character but was: 1 expected: an alphabetic character -" - ] +"] ); } @@ -144,12 +138,10 @@ fn verify_borrowed_char_is_alphabetic_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected subject to be an alphabetic character + &[r"expected subject to be an alphabetic character but was: @ expected: an alphabetic character -" - ] +"] ); } @@ -165,12 +157,10 @@ fn verify_char_is_alphanumeric_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected subject to be an alphanumeric character + &[r"expected subject to be an alphanumeric character but was: @ expected: an alphanumeric character -" - ] +"] ); } @@ -186,12 +176,10 @@ fn verify_borrowed_char_is_alphanumeric_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected subject to be an alphanumeric character + &[r"expected subject to be an alphanumeric character but was: + expected: an alphanumeric character -" - ] +"] ); } @@ -206,12 +194,10 @@ fn verify_char_is_control_char_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected subject to be a control character + &[r"expected subject to be a control character but was: [ expected: a control character -" - ] +"] ); } @@ -226,12 +212,10 @@ fn verify_borrowed_char_is_control_char_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected subject to be a control character + &[r"expected subject to be a control character but was: @ expected: a control character -" - ] +"] ); } @@ -246,12 +230,10 @@ fn verify_char_is_digit_in_radix_10_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected subject to be a digit in the radix 10 + &[r"expected subject to be a digit in the radix 10 but was: A expected: a digit in the radix 10 -" - ] +"] ); } @@ -266,12 +248,10 @@ fn verify_borrowed_char_is_digit_in_radix_10_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected subject to be a digit in the radix 10 + &[r"expected subject to be a digit in the radix 10 but was: F expected: a digit in the radix 10 -" - ] +"] ); } @@ -286,12 +266,10 @@ fn verify_char_is_digit_in_radix_16_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected subject to be a digit in the radix 16 + &[r"expected subject to be a digit in the radix 16 but was: G expected: a digit in the radix 16 -" - ] +"] ); } @@ -306,12 +284,10 @@ fn verify_borrowed_char_is_digit_in_radix_16_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected subject to be a digit in the radix 16 + &[r"expected subject to be a digit in the radix 16 but was: g expected: a digit in the radix 16 -" - ] +"] ); } @@ -326,12 +302,10 @@ fn verify_char_is_digit_in_radix_7_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected subject to be a digit in the radix 7 + &[r"expected subject to be a digit in the radix 7 but was: 7 expected: a digit in the radix 7 -" - ] +"] ); } @@ -346,12 +320,10 @@ fn verify_borrowed_char_is_digit_in_radix_7_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected subject to be a digit in the radix 7 + &[r"expected subject to be a digit in the radix 7 but was: 9 expected: a digit in the radix 7 -" - ] +"] ); } @@ -366,7 +338,7 @@ fn verify_char_is_whitespace_fails() { assert_eq!( failures, - &[r"assertion failed: expected subject to be whitespace + &[r"expected subject to be whitespace but was: _ expected: whitespace "] @@ -384,7 +356,7 @@ fn verify_borrowed_char_is_whitespace_fails() { assert_eq!( failures, - &[r"assertion failed: expected subject to be whitespace + &[r"expected subject to be whitespace but was: = expected: whitespace "] diff --git a/src/colored/tests.rs b/src/colored/tests.rs index a45c53e..83226f1 100644 --- a/src/colored/tests.rs +++ b/src/colored/tests.rs @@ -60,7 +60,7 @@ mod with_colored_feature { .display_failures(); assert_eq!(failures, &[ - "assertion failed: expected subject to be equal to Some(Foo { lorem: \"Hello World!\", ipsum: 42, dolor: Some(\"hey ho!\") })\n \ + "expected subject to be equal to Some(Foo { lorem: \"Hello World!\", ipsum: 42, dolor: Some(\"hey ho!\") })\n \ but was: Some(Foo { lorem: \"\u{1b}[31m¡\u{1b}[0mH\u{1b}[31mo\u{1b}[0ml\u{1b}[31ma,\u{1b}[0m W\u{1b}[31me\u{1b}[0ml\u{1b}[31mt\u{1b}[0m!\", ipsum: 42, dolor: Some(\"hey\") })\n \ expected: Some(Foo { lorem: \"H\u{1b}[32me\u{1b}[0ml\u{1b}[32mlo\u{1b}[0m W\u{1b}[32mor\u{1b}[0ml\u{1b}[32md\u{1b}[0m!\", ipsum: 42, dolor: Some(\"hey\u{1b}[32m ho!\u{1b}[0m\") })\n\ ", diff --git a/src/error/tests.rs b/src/error/tests.rs index 8681f8e..0155b2f 100644 --- a/src/error/tests.rs +++ b/src/error/tests.rs @@ -59,7 +59,7 @@ fn verify_error_has_debug_message_fails() { assert_eq!( failures, &[ - r#"assertion failed: expected subject to have debug message "SuperError { source: Bar }" + r#"expected subject to have debug message "SuperError { source: Bar }" but was: SuperError { source: Foo } expected: SuperError { source: Bar } "# @@ -89,7 +89,7 @@ fn verify_error_does_not_have_debug_message_fails() { assert_eq!( failures, &[ - r#"assertion failed: expected subject to not have debug message "SuperError { source: Bar }" + r#"expected subject to not have debug message "SuperError { source: Bar }" but was: SuperError { source: Bar } expected: not SuperError { source: Bar } "# @@ -119,7 +119,7 @@ fn verify_error_has_display_message_fails() { assert_eq!( failures, &[ - r#"assertion failed: expected subject to have display message "super-error caused by bar error" + r#"expected subject to have display message "super-error caused by bar error" but was: "super-error caused by foo error" expected: "super-error caused by bar error" "# @@ -149,7 +149,7 @@ fn verify_error_does_not_have_display_message_fails() { assert_eq!( failures, &[ - r#"assertion failed: expected subject to not have display message "super-error caused by foo error" + r#"expected subject to not have display message "super-error caused by foo error" but was: "super-error caused by foo error" expected: not "super-error caused by foo error" "# @@ -177,7 +177,7 @@ fn verify_error_has_no_source_fails() { assert_eq!( failures, - &[r"assertion failed: expected my error to have no source + &[r"expected my error to have no source but was: SuperError { source: Foo } expected: "] @@ -204,7 +204,7 @@ fn verify_error_has_source_fails() { assert_eq!( failures, - &[r"assertion failed: expected my error to have a source + &[r"expected my error to have a source but was: Bar expected: "] @@ -234,7 +234,7 @@ fn verify_error_has_source_message_fails_wrong_source() { assert_eq!( failures, &[ - r#"assertion failed: expected my error to have a source message equal to "foo error" + r#"expected my error to have a source message equal to "foo error" but was: "bar error" expected: "foo error" "# @@ -254,7 +254,7 @@ fn verify_error_has_source_message_fails_error_without_source() { assert_eq!( failures, &[ - r#"assertion failed: expected my error to have a source message equal to "foo error" + r#"expected my error to have a source message equal to "foo error" but was: Foo - which has no source expected: "foo error" "# @@ -292,7 +292,7 @@ mod colored { assert_eq!( failures, - &["assertion failed: expected subject to have no source\n \ + &["expected subject to have no source\n \ but was: \u{1b}[31mSuperError { source: Foo }\u{1b}[0m\n \ expected: \u{1b}[33m\u{1b}[0m\n\ "] @@ -310,7 +310,7 @@ mod colored { assert_eq!( failures, - &["assertion failed: expected subject to have a source\n \ + &["expected subject to have a source\n \ but was: \u{1b}[31mFoo\u{1b}[0m\n \ expected: \u{1b}[33m\u{1b}[0m\n\ "] @@ -331,7 +331,7 @@ mod colored { assert_eq!( failures, &[ - "assertion failed: expected subject to have a source message equal to \"foo error\"\n \ + "expected subject to have a source message equal to \"foo error\"\n \ but was: \"\u{1b}[31mbar error\u{1b}[0m\"\n \ expected: \"\u{1b}[33mfoo error\u{1b}[0m\"\n\ " @@ -351,7 +351,7 @@ mod colored { assert_eq!( failures, &[ - "assertion failed: expected subject to have a source message equal to \"foo error\"\n \ + "expected subject to have a source message equal to \"foo error\"\n \ but was: \u{1b}[31mFoo\u{1b}[0m - which has no source\n \ expected: \u{1b}[33m\"foo error\"\u{1b}[0m\n\ " diff --git a/src/expectation_combinators/tests.rs b/src/expectation_combinators/tests.rs index a5e5095..82e8f4b 100644 --- a/src/expectation_combinators/tests.rs +++ b/src/expectation_combinators/tests.rs @@ -80,7 +80,7 @@ fn verify_all_combinator_asserts_2_expectations_fails() { assert_eq!( failures, - &["assertion failed: expected subject to be negative\n \ + &["expected subject to be negative\n \ but was: 42\n \ expected: < 0\n\ expected subject to be zero\n \ @@ -115,7 +115,7 @@ fn verify_all_combinator_asserts_3_expectations_fails() { assert_eq!( failures, - &["assertion failed: expected subject to be positive\n \ + &["expected subject to be positive\n \ but was: -42\n \ expected: > 0\n\ expected subject to be between 41 and 43\n \ @@ -152,7 +152,7 @@ fn verify_all_combinator_asserts_4_expectations_fails() { assert_eq!( failures, - &["assertion failed: expected subject to be positive\n \ + &["expected subject to be positive\n \ but was: -42\n \ expected: > 0\n\ expected subject to be greater than 2\n \ @@ -255,12 +255,10 @@ fn verify_any_combinator_asserts_1_expectations_fails() { assert_eq!( failures, - &[ - "assertion failed: expected subject to contain \"fugiaty\"\n \ + &["expected subject to contain \"fugiaty\"\n \ but was: \"nulla elit fugiat reprehenderit\"\n \ expected: \"fugiaty\"\n\ - \n" - ] + \n"] ); } @@ -291,15 +289,13 @@ fn verify_any_combinator_asserts_2_expectations_fails() { assert_eq!( failures, - &[ - "assertion failed: expected subject to contain \"fugiaty\"\n \ + &["expected subject to contain \"fugiaty\"\n \ but was: \"nulla elit fugiat reprehenderit\"\n \ expected: \"fugiaty\"\n\ expected subject to contain \"ellit\"\n \ but was: \"nulla elit fugiat reprehenderit\"\n \ expected: \"ellit\"\n\ - \n" - ] + \n"] ); } @@ -336,8 +332,7 @@ fn verify_any_combinator_asserts_3_expectations_fails() { assert_eq!( failures, - &[ - "assertion failed: expected subject to contain \"fugiaty\"\n \ + &["expected subject to contain \"fugiaty\"\n \ but was: \"nulla elit fugiat reprehenderit\"\n \ expected: \"fugiaty\"\n\ expected subject to contain \"ellit\"\n \ @@ -346,8 +341,7 @@ fn verify_any_combinator_asserts_3_expectations_fails() { expected subject to contain any of ['x', 'y', 'z']\n \ but was: \"nulla elit fugiat reprehenderit\"\n \ expected: ['x', 'y', 'z']\n\ - \n" - ] + \n"] ); } diff --git a/src/float/tests.rs b/src/float/tests.rs index 326a2f2..76e15fe 100644 --- a/src/float/tests.rs +++ b/src/float/tests.rs @@ -35,7 +35,7 @@ fn verify_f64_is_negative_fails() { assert_eq!( failures, - &[r"assertion failed: expected some_number to be negative + &[r"expected some_number to be negative but was: 0.0 expected: < 0 "] @@ -79,7 +79,7 @@ fn verify_f64_is_not_negative_fails() { assert_eq!( failures, - &[r"assertion failed: expected some_number to be not negative + &[r"expected some_number to be not negative but was: -0.001 expected: >= 0 "] @@ -119,7 +119,7 @@ fn verify_f64_is_positive_fails() { assert_eq!( failures, - &[r"assertion failed: expected some_number to be positive + &[r"expected some_number to be positive but was: 0.0 expected: > 0 "] @@ -163,7 +163,7 @@ fn verify_f64_is_not_positive_fails() { assert_eq!( failures, - &[r"assertion failed: expected some_number to be not positive + &[r"expected some_number to be not positive but was: 0.001 expected: <= 0 "] @@ -199,7 +199,7 @@ fn verify_f64_is_zero_fails() { assert_eq!( failures, - &[r"assertion failed: expected some_number to be zero + &[r"expected some_number to be zero but was: 1.0 expected: 0.0 "] @@ -235,7 +235,7 @@ fn verify_f64_is_one_fails() { assert_eq!( failures, - &[r"assertion failed: expected some_number to be one + &[r"expected some_number to be one but was: 0.0 expected: 1.0 "] @@ -285,7 +285,7 @@ fn verify_f64_is_finite_fails() { assert_eq!( failures, - &[r"assertion failed: expected some_number to be finite + &[r"expected some_number to be finite but was: -inf expected: a finite number "] @@ -320,7 +320,7 @@ fn verify_f64_is_infinite_fails() { assert_eq!( failures, - &[r"assertion failed: expected some_number to be infinite + &[r"expected some_number to be infinite but was: 0.0 expected: an infinite number "] @@ -374,7 +374,7 @@ fn verify_f64_is_a_number_fails() { assert_eq!( failures, - &[r"assertion failed: expected some_number to be a number + &[r"expected some_number to be a number but was: NaN expected: a number "] @@ -395,7 +395,7 @@ fn verify_f32_is_not_a_number_fails() { assert_eq!( failures, - &[r"assertion failed: expected some_number to be not a number + &[r"expected some_number to be not a number but was: 0.0 expected: NaN "] @@ -427,7 +427,7 @@ fn verify_f64_is_not_a_number_fails() { assert_eq!( failures, - &[r"assertion failed: expected some_number to be not a number + &[r"expected some_number to be not a number but was: 0.0 expected: NaN "] @@ -452,7 +452,7 @@ mod cmp { assert_eq!( failures, - &[r"assertion failed: expected tau / 2 to be close to 3.15 + &[r"expected tau / 2 to be close to 3.15 within a margin of epsilon=4.7683716e-7 and ulps=4 but was: 3.14 expected: 3.15 @@ -474,7 +474,7 @@ mod cmp { assert_eq!( failures, - &[r"assertion failed: expected tau / 2 to be not close to 3.14 + &[r"expected tau / 2 to be not close to 3.14 within a margin of epsilon=4.7683716e-7 and ulps=4 but was: 3.14 expected: 3.14 @@ -496,7 +496,7 @@ mod cmp { assert_eq!( failures, - &[r"assertion failed: expected tau / 2 to be close to 3.15 + &[r"expected tau / 2 to be close to 3.15 within a margin of epsilon=2.3841858e-7 and ulps=3 but was: 3.14 expected: 3.15 @@ -518,7 +518,7 @@ mod cmp { assert_eq!( failures, - &[r"assertion failed: expected tau / 2 to be not close to 3.14 + &[r"expected tau / 2 to be not close to 3.14 within a margin of epsilon=2.3841858e-7 and ulps=3 but was: 3.14 expected: 3.14 @@ -540,7 +540,7 @@ mod cmp { assert_eq!( failures, - &[r"assertion failed: expected tau / 2 to be close to 3.15 + &[r"expected tau / 2 to be close to 3.15 within a margin of epsilon=8.881784197001252e-16 and ulps=4 but was: 3.14 expected: 3.15 @@ -562,7 +562,7 @@ mod cmp { assert_eq!( failures, - &[r"assertion failed: expected tau / 2 to be not close to 3.14 + &[r"expected tau / 2 to be not close to 3.14 within a margin of epsilon=8.881784197001252e-16 and ulps=4 but was: 3.14 expected: 3.14 @@ -584,7 +584,7 @@ mod cmp { assert_eq!( failures, - &[r"assertion failed: expected tau / 2 to be close to 3.15 + &[r"expected tau / 2 to be close to 3.15 within a margin of epsilon=4.440892098500626e-16 and ulps=3 but was: 3.14 expected: 3.15 @@ -606,7 +606,7 @@ mod cmp { assert_eq!( failures, - &[r"assertion failed: expected tau / 2 to be not close to 3.14 + &[r"expected tau / 2 to be not close to 3.14 within a margin of epsilon=4.440892098500626e-16 and ulps=3 but was: 3.14 expected: 3.14 @@ -627,13 +627,11 @@ mod cmp { assert_eq!( failures, - &[ - "assertion failed: expected subject to be close to 3.15148\n \ + &["expected subject to be close to 3.15148\n \ within a margin of epsilon=2.3841858e-7 and ulps=3\n \ but was: 3.1\u{1b}[31m41\u{1b}[0m5\u{1b}[31m9\u{1b}[0m\n \ expected: 3.15\u{1b}[34m148\u{1b}[0m\n\ - " - ] + "] ); } @@ -646,13 +644,11 @@ mod cmp { assert_eq!( failures, - &[ - "assertion failed: expected subject to be close to 3.15148\n \ + &["expected subject to be close to 3.15148\n \ within a margin of epsilon=4.440892098500626e-16 and ulps=3\n \ but was: 3.1\u{1b}[31m41\u{1b}[0m5\u{1b}[31m9\u{1b}[0m\n \ expected: 3.15\u{1b}[34m148\u{1b}[0m\n\ - " - ] + "] ); } } diff --git a/src/integer/tests.rs b/src/integer/tests.rs index 6c87666..e4df857 100644 --- a/src/integer/tests.rs +++ b/src/integer/tests.rs @@ -37,7 +37,7 @@ fn verify_i32_is_equal_to_i32_fails() { assert_eq!( failures, - &[r"assertion failed: expected my_thing to be equal to -42 + &[r"expected my_thing to be equal to -42 but was: 42 expected: -42 "] @@ -101,7 +101,7 @@ fn verify_i32_is_negative_fails() { assert_eq!( failures, - &[r"assertion failed: expected some_number to be negative + &[r"expected some_number to be negative but was: 0 expected: < 0 "] @@ -173,7 +173,7 @@ fn verify_i32_is_not_negative_fails() { assert_eq!( failures, - &[r"assertion failed: expected some_number to be not negative + &[r"expected some_number to be not negative but was: -1 expected: >= 0 "] @@ -237,7 +237,7 @@ fn verify_i32_is_positive_fails() { assert_eq!( failures, - &[r"assertion failed: expected some_number to be positive + &[r"expected some_number to be positive but was: 0 expected: > 0 "] @@ -309,7 +309,7 @@ fn verify_i32_is_not_positive_fails() { assert_eq!( failures, - &[r"assertion failed: expected some_number to be not positive + &[r"expected some_number to be not positive but was: 1 expected: <= 0 "] @@ -390,7 +390,7 @@ fn verify_u64_is_zero_fails() { assert_eq!( failures, - &[r"assertion failed: expected some_number to be zero + &[r"expected some_number to be zero but was: 1 expected: 0 "] @@ -471,7 +471,7 @@ fn verify_u64_is_one_fails() { assert_eq!( failures, - &[r"assertion failed: expected some_number to be one + &[r"expected some_number to be one but was: 0 expected: 1 "] @@ -491,7 +491,7 @@ mod colored { assert_eq!( failures, - &["assertion failed: expected subject to be equal to 42\n \ + &["expected subject to be equal to 42\n \ but was: \u{1b}[31m37\u{1b}[0m\n \ expected: \u{1b}[34m42\u{1b}[0m\n\ "] @@ -507,12 +507,10 @@ mod colored { assert_eq!( failures, - &[ - "assertion failed: expected subject to be not equal to 42\n \ + &["expected subject to be not equal to 42\n \ but was: 42\n \ expected: not 42\n\ - " - ] + "] ); } } diff --git a/src/iterator/tests.rs b/src/iterator/tests.rs index 3d28731..3194bfb 100644 --- a/src/iterator/tests.rs +++ b/src/iterator/tests.rs @@ -97,7 +97,7 @@ fn verify_custom_collection_contains_fails() { assert_eq!( failures, - &[r"assertion failed: expected my_thing to contain 42 + &[r"expected my_thing to contain 42 but was: [1, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43] expected: 42 "] @@ -128,7 +128,7 @@ fn verify_custom_iterator_contains_fails() { assert_eq!( failures, - &[r"assertion failed: expected my_thing to contain 42 + &[r"expected my_thing to contain 42 but was: [1, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43] expected: 42 "] @@ -160,7 +160,7 @@ fn verify_custom_collection_does_not_contain_fails() { assert_eq!( failures, - &[r"assertion failed: expected my_thing to not contain 19 + &[r"expected my_thing to not contain 19 but was: [1, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43] expected: not 19 "] @@ -194,7 +194,7 @@ fn verify_custom_iterator_does_not_contain_fails() { assert_eq!( failures, - &[r"assertion failed: expected my_thing to not contain 19 + &[r"expected my_thing to not contain 19 but was: [1, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43] expected: not 19 "] diff --git a/src/lib.rs b/src/lib.rs index 21a6d7e..727a763 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -59,7 +59,7 @@ //! will print the error message: //! //! ```console -//! assertion failed: expected 6 * 8 - 5 to be equal to 42 +//! expected 6 * 8 - 5 to be equal to 42 //! but was: 43 //! expected: 42 //! ``` @@ -149,11 +149,11 @@ //! assertions in the panic message: //! //! ```console -//! assertion failed: expected subject to contain "unimportant" +//! expected subject to contain "unimportant" //! but was: "the answer to all important questions is 42" //! expected: "unimportant" //! -//! assertion failed: expected subject to have at most a length of 41 +//! expected subject to have at most a length of 41 //! but was: 43 //! expected: <= 41 //! ``` @@ -319,7 +319,7 @@ //! let failures = verify_that!(7 * 5).is_equal_to(42).display_failures(); //! //! assert_that!(failures).contains_exactly([ -//! r"assertion failed: expected 7 * 5 to be equal to 42 +//! r"expected 7 * 5 to be equal to 42 //! but was: 35 //! expected: 42 //! " diff --git a/src/map/tests.rs b/src/map/tests.rs index b857d0d..f04e974 100644 --- a/src/map/tests.rs +++ b/src/map/tests.rs @@ -88,7 +88,7 @@ mod hashbrown { assert_eq!( failures, &[format!( - r"assertion failed: expected foo_map to contain the key 7 + r"expected foo_map to contain the key 7 but was: {formatted_actual} expected: 7 " @@ -116,7 +116,7 @@ mod hashbrown { assert_eq!( failures, &[format!( - r"assertion failed: expected foo_map to not contain the key 5 + r"expected foo_map to not contain the key 5 but was: {formatted_actual} expected: not 5 " @@ -158,7 +158,7 @@ mod hashbrown { assert_eq!( failures, &[format!( - r#"assertion failed: expected foo_map to contain the value "six" + r#"expected foo_map to contain the value "six" but was: {formatted_actual} expected: "six" "# @@ -186,7 +186,7 @@ mod hashbrown { assert_eq!( failures, &[format!( - r#"assertion failed: expected foo_map to not contain the value "five" + r#"expected foo_map to not contain the value "five" but was: {formatted_actual} expected: not "five" "# @@ -214,7 +214,7 @@ mod hashbrown { assert_eq!( failures, &[format!( - r"assertion failed: expected foo_map to contain the keys [5, 3, 4] + r"expected foo_map to contain the keys [5, 3, 4] but was: {formatted_actual} expected: [5, 3, 4] missing: [3] @@ -236,7 +236,7 @@ mod hashbrown { assert_eq!( failures, &[format!( - r"assertion failed: expected foo_map to contain the keys [5, 3, 4] + r"expected foo_map to contain the keys [5, 3, 4] but was: {formatted_actual} expected: [5, 3, 4] missing: [3] @@ -258,7 +258,7 @@ mod hashbrown { assert_eq!( failures, &[format!( - r"assertion failed: expected foo_map to contain the keys [5, 3, 4] + r"expected foo_map to contain the keys [5, 3, 4] but was: {formatted_actual} expected: [5, 3, 4] missing: [3] @@ -287,7 +287,7 @@ mod hashbrown { assert_eq!( failures, &[format!( - r#"assertion failed: expected foo_map to contain the values ["one", "two", "three"] + r#"expected foo_map to contain the values ["one", "two", "three"] but was: {formatted_actual} expected: ["one", "two", "three"] missing: ["two", "three"] @@ -323,7 +323,7 @@ mod hashbrown { assert_eq!( failures, &[format!( - r"assertion failed: expected foo_map to not contain the keys [5, 3, 4] + r"expected foo_map to not contain the keys [5, 3, 4] but was: {formatted_actual} expected: [5, 3, 4] extra: {formatted_extra} @@ -352,7 +352,7 @@ mod hashbrown { assert_eq!( failures, &[format!( - r#"assertion failed: expected foo_map to not contain the values ["one", "two", "three"] + r#"expected foo_map to not contain the values ["one", "two", "three"] but was: {formatted_actual} expected: ["one", "two", "three"] extra: ["one"] @@ -388,7 +388,7 @@ mod hashbrown { assert_eq!( failures, &[format!( - r"assertion failed: expected foo_map to contain exactly the keys [5, 2, 6, 3] + r"expected foo_map to contain exactly the keys [5, 2, 6, 3] but was: {formatted_actual} expected: [5, 2, 6, 3] missing: [2, 3] @@ -489,7 +489,7 @@ mod std_hash_map { assert_eq!( failures, &[format!( - r"assertion failed: expected foo_map to contain the key 7 + r"expected foo_map to contain the key 7 but was: {formatted_actual} expected: 7 " @@ -517,7 +517,7 @@ mod std_hash_map { assert_eq!( failures, &[format!( - r"assertion failed: expected foo_map to not contain the key 4 + r"expected foo_map to not contain the key 4 but was: {formatted_actual} expected: not 4 " @@ -559,7 +559,7 @@ mod std_hash_map { assert_eq!( failures, &[format!( - r#"assertion failed: expected foo_map to contain the value "six" + r#"expected foo_map to contain the value "six" but was: {formatted_actual} expected: "six" "# @@ -587,7 +587,7 @@ mod std_hash_map { assert_eq!( failures, &[format!( - r#"assertion failed: expected foo_map to not contain the value "four" + r#"expected foo_map to not contain the value "four" but was: {formatted_actual} expected: not "four" "# @@ -615,7 +615,7 @@ mod std_hash_map { assert_eq!( failures, &[format!( - r"assertion failed: expected foo_map to contain the keys [2, 3, 5] + r"expected foo_map to contain the keys [2, 3, 5] but was: {formatted_actual} expected: [2, 3, 5] missing: [2, 3] @@ -637,7 +637,7 @@ mod std_hash_map { assert_eq!( failures, &[format!( - r"assertion failed: expected foo_map to contain the keys [2, 3, 5] + r"expected foo_map to contain the keys [2, 3, 5] but was: {formatted_actual} expected: [2, 3, 5] missing: [2, 3] @@ -659,7 +659,7 @@ mod std_hash_map { assert_eq!( failures, &[format!( - r"assertion failed: expected foo_map to contain the keys [2, 3, 5] + r"expected foo_map to contain the keys [2, 3, 5] but was: {formatted_actual} expected: [2, 3, 5] missing: [2, 3] @@ -688,7 +688,7 @@ mod std_hash_map { assert_eq!( failures, &[format!( - r#"assertion failed: expected foo_map to contain the values ["one", "two", "three"] + r#"expected foo_map to contain the values ["one", "two", "three"] but was: {formatted_actual} expected: ["one", "two", "three"] missing: ["two", "three"] @@ -717,7 +717,7 @@ mod std_hash_map { assert_eq!( failures, &[format!( - r"assertion failed: expected foo_map to contain exactly the keys [4, 5, 6, 3] + r"expected foo_map to contain exactly the keys [4, 5, 6, 3] but was: {formatted_actual} expected: [4, 5, 6, 3] missing: [3] @@ -816,7 +816,7 @@ mod btree_map { assert_eq!( failures, - &[r#"assertion failed: expected foo_map to contain the key 7 + &[r#"expected foo_map to contain the key 7 but was: {1: "one", 4: "four", 5: "five"} expected: 7 "#] @@ -841,12 +841,10 @@ mod btree_map { assert_eq!( failures, - &[ - r#"assertion failed: expected foo_map to not contain the key 1 + &[r#"expected foo_map to not contain the key 1 but was: {1: "one", 4: "four", 5: "five"} expected: not 1 -"# - ] +"#] ); } @@ -882,12 +880,10 @@ mod btree_map { assert_eq!( failures, - &[ - r#"assertion failed: expected foo_map to contain the value "six" + &[r#"expected foo_map to contain the value "six" but was: {1: "one", 4: "four", 5: "five"} expected: "six" -"# - ] +"#] ); } @@ -909,12 +905,10 @@ mod btree_map { assert_eq!( failures, - &[ - r#"assertion failed: expected foo_map to not contain the value "one" + &[r#"expected foo_map to not contain the value "one" but was: {1: "one", 4: "four", 5: "five"} expected: not "one" -"# - ] +"#] ); } @@ -938,7 +932,7 @@ mod btree_map { assert_eq!( failures, &[format!( - r"assertion failed: expected foo_map to contain the keys [5, 3, 7] + r"expected foo_map to contain the keys [5, 3, 7] but was: {formatted_actual} expected: [5, 3, 7] missing: [3, 7] @@ -960,7 +954,7 @@ mod btree_map { assert_eq!( failures, &[format!( - r"assertion failed: expected foo_map to contain the keys [5, 3, 7] + r"expected foo_map to contain the keys [5, 3, 7] but was: {formatted_actual} expected: [5, 3, 7] missing: [3, 7] @@ -982,7 +976,7 @@ mod btree_map { assert_eq!( failures, &[format!( - r"assertion failed: expected foo_map to contain the keys [5, 3, 7] + r"expected foo_map to contain the keys [5, 3, 7] but was: {formatted_actual} expected: [5, 3, 7] missing: [3, 7] @@ -1011,7 +1005,7 @@ mod btree_map { assert_eq!( failures, &[format!( - r#"assertion failed: expected foo_map to contain the values ["one", "two", "three"] + r#"expected foo_map to contain the values ["one", "two", "three"] but was: {formatted_actual} expected: ["one", "two", "three"] missing: ["two", "three"] @@ -1047,7 +1041,7 @@ mod btree_map { assert_eq!( failures, &[format!( - r"assertion failed: expected foo_map to contain exactly the keys [5, 2, 6, 3] + r"expected foo_map to contain exactly the keys [5, 2, 6, 3] but was: {formatted_actual} expected: [5, 2, 6, 3] missing: [2, 3] @@ -1083,7 +1077,7 @@ mod colored { assert_eq!( failures, &[format!( - "assertion failed: expected foo_map to contain the key 2\n \ + "expected foo_map to contain the key 2\n \ but was: {formatted_actual}\n \ expected: \u{1b}[32m2\u{1b}[0m\n\ " @@ -1106,7 +1100,7 @@ mod colored { assert_eq!( failures, &[format!( - "assertion failed: expected foo_map to not contain the key 1\n \ + "expected foo_map to not contain the key 1\n \ but was: {formatted_actual}\n \ expected: not \u{1b}[32m1\u{1b}[0m\n\ " @@ -1132,7 +1126,7 @@ mod colored { assert_eq!( failures, &[format!( - "assertion failed: expected foo_map to contain the value \"three\"\n \ + "expected foo_map to contain the value \"three\"\n \ but was: {formatted_actual}\n \ expected: \u{1b}[32m\"three\"\u{1b}[0m\n\ " @@ -1155,7 +1149,7 @@ mod colored { assert_eq!( failures, &[format!( - "assertion failed: expected foo_map to not contain the value \"four\"\n \ + "expected foo_map to not contain the value \"four\"\n \ but was: {formatted_actual}\n \ expected: not \u{1b}[32m\"four\"\u{1b}[0m\n\ " @@ -1179,7 +1173,7 @@ mod colored { assert_eq!( failures, &[format!( - "assertion failed: expected foo_map to contain the keys [5, 2, 4, 7]\n \ + "expected foo_map to contain the keys [5, 2, 4, 7]\n \ but was: {formatted_actual}\n \ expected: [5, \u{1b}[32m2\u{1b}[0m, 4, \u{1b}[32m7\u{1b}[0m]\n \ missing: [2, 7]\n\ @@ -1211,7 +1205,7 @@ mod colored { assert_eq!( failures, &[format!( - "assertion failed: expected foo_map to not contain the keys [5, 2, 4, 7]\n \ + "expected foo_map to not contain the keys [5, 2, 4, 7]\n \ but was: {formatted_actual}\n \ expected: [\u{1b}[32m5\u{1b}[0m, 2, \u{1b}[32m4\u{1b}[0m, 7]\n \ extra: {formatted_extra}\n\ @@ -1236,7 +1230,7 @@ mod colored { assert_eq!( failures, &[format!( - "assertion failed: expected foo_map to contain the values [\"five\", \"two\", \"four\", \"seven\"]\n \ + "expected foo_map to contain the values [\"five\", \"two\", \"four\", \"seven\"]\n \ but was: {formatted_actual}\n \ expected: [\"five\", \u{1b}[32m\"two\"\u{1b}[0m, \"four\", \u{1b}[32m\"seven\"\u{1b}[0m]\n \ missing: [\"two\", \"seven\"]\n\ @@ -1268,7 +1262,7 @@ mod colored { assert_eq!( failures, &[format!( - "assertion failed: expected foo_map to not contain the values [\"five\", \"two\", \"four\", \"seven\"]\n \ + "expected foo_map to not contain the values [\"five\", \"two\", \"four\", \"seven\"]\n \ but was: {formatted_actual}\n \ expected: [\u{1b}[32m\"five\"\u{1b}[0m, \"two\", \u{1b}[32m\"four\"\u{1b}[0m, \"seven\"]\n \ extra: {formatted_extra}\n\ @@ -1300,7 +1294,7 @@ mod colored { assert_eq!( failures, &[format!( - "assertion failed: expected foo_map to contain exactly the keys [5, 2, 6, 3]\n \ + "expected foo_map to contain exactly the keys [5, 2, 6, 3]\n \ but was: {formatted_actual}\n \ expected: [5, \u{1b}[32m2\u{1b}[0m, 6, \u{1b}[32m3\u{1b}[0m]\n \ missing: [2, 3]\n \ diff --git a/src/num_bigint/tests.rs b/src/num_bigint/tests.rs index 90a1801..ff21f63 100644 --- a/src/num_bigint/tests.rs +++ b/src/num_bigint/tests.rs @@ -18,7 +18,7 @@ fn verify_bigint_is_equal_to_other_fails() { assert_eq!( failures, - &[r"assertion failed: expected subject to be equal to -42 + &[r"expected subject to be equal to -42 but was: 42 expected: -42 "] @@ -156,7 +156,7 @@ fn verify_biguint_is_equal_to_other_fails() { assert_eq!( failures, - &[r"assertion failed: expected subject to be equal to 22 + &[r"expected subject to be equal to 22 but was: 42 expected: 22 "] diff --git a/src/option/mod.rs b/src/option/mod.rs index 7b151ad..95302a7 100644 --- a/src/option/mod.rs +++ b/src/option/mod.rs @@ -46,7 +46,7 @@ where fn some(self) -> Spec<'a, T, R> { self.mapping(|subject| match subject { None => { - panic!("assertion failed: expected the subject to be `Some(_)`, but was `None`") + panic!("expected the subject to be `Some(_)`, but was `None`") }, Some(value) => value, }) @@ -60,7 +60,7 @@ where fn some(self) -> Spec<'a, &'a T, R> { self.mapping(|subject| match subject { None => { - panic!("assertion failed: expected the subject to be `Some(_)`, but was `None`") + panic!("expected the subject to be `Some(_)`, but was `None`") }, Some(value) => value, }) diff --git a/src/option/tests.rs b/src/option/tests.rs index ef810dc..aa2507a 100644 --- a/src/option/tests.rs +++ b/src/option/tests.rs @@ -56,7 +56,7 @@ fn verify_option_of_custom_struct_is_none_fails() { assert_eq!( failures, - &[r"assertion failed: expected my_thing to be None + &[r"expected my_thing to be None but was: Some(Foo) expected: None "] @@ -87,7 +87,7 @@ fn verify_option_of_custom_struct_is_some_fails() { assert_eq!( failures, - &[r"assertion failed: expected my_thing to be Some(_) + &[r"expected my_thing to be Some(_) but was: None expected: Some(_) "] @@ -118,7 +118,7 @@ fn verify_borrowed_option_of_custom_struct_is_none_fails() { assert_eq!( failures, - &[r"assertion failed: expected my_thing to be None + &[r"expected my_thing to be None but was: Some(Foo) expected: None "] @@ -149,7 +149,7 @@ fn verify_borrowed_option_of_custom_struct_is_some_fails() { assert_eq!( failures, - &[r"assertion failed: expected my_thing to be Some(_) + &[r"expected my_thing to be Some(_) but was: None expected: Some(_) "] @@ -195,7 +195,7 @@ fn verify_option_of_string_has_some_value_fails() { assert_eq!( failures, &[ - r#"assertion failed: expected my_thing to be some containing "labore dolores voluptate culpa" + r#"expected my_thing to be some containing "labore dolores voluptate culpa" but was: Some("labore dolore voluptate culpa") expected: Some("labore dolores voluptate culpa") "# @@ -241,12 +241,10 @@ fn verify_option_of_custom_struct_has_value_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to be some containing Foo + &[r"expected my_thing to be some containing Foo but was: None expected: Some(Foo) -" - ] +"] ); } @@ -274,12 +272,10 @@ fn verify_borrowed_option_of_custom_struct_has_value_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to be some containing Foo + &[r"expected my_thing to be some containing Foo but was: None expected: Some(Foo) -" - ] +"] ); } @@ -308,7 +304,7 @@ fn map_option_with_none_to_its_value() { assert_that_code(|| { assert_that(subject).some().is_empty(); }) - .panics_with_message("assertion failed: expected the subject to be `Some(_)`, but was `None`"); + .panics_with_message("expected the subject to be `Some(_)`, but was `None`"); } #[test] @@ -326,7 +322,7 @@ fn map_borrowed_option_with_none_to_its_value() { assert_that_code(|| { assert_that(&subject).some().is_empty(); }) - .panics_with_message("assertion failed: expected the subject to be `Some(_)`, but was `None`"); + .panics_with_message("expected the subject to be `Some(_)`, but was `None`"); } #[cfg(feature = "colored")] @@ -345,7 +341,7 @@ mod colored { assert_eq!( failures, - &["assertion failed: expected subject to be Some(_)\n \ + &["expected subject to be Some(_)\n \ but was: \u{1b}[31mNone\u{1b}[0m\n \ expected: \u{1b}[33mSome(_)\u{1b}[0m\n\ "] @@ -363,7 +359,7 @@ mod colored { assert_eq!( failures, - &["assertion failed: expected subject to be None\n \ + &["expected subject to be None\n \ but was: \u{1b}[31mSome(3500)\u{1b}[0m\n \ expected: \u{1b}[33mNone\u{1b}[0m\n\ "] @@ -382,7 +378,7 @@ mod colored { assert_eq!( failures, &[ - "assertion failed: expected subject to be some containing [1, 2, 3, 5, 7]\n \ + "expected subject to be some containing [1, 2, 3, 5, 7]\n \ but was: \u{1b}[31mNone\u{1b}[0m\n \ expected: \u{1b}[33mSome([1, 2, 3, 5, 7])\u{1b}[0m\n\ " diff --git a/src/order/tests.rs b/src/order/tests.rs index 7247e0b..2583e1c 100644 --- a/src/order/tests.rs +++ b/src/order/tests.rs @@ -22,7 +22,7 @@ fn verify_i32_is_less_than_other_i32_fails() { assert_eq!( failures, - &[r"assertion failed: expected my_thing to be less than 42 + &[r"expected my_thing to be less than 42 but was: 42 expected: < 42 "] @@ -47,7 +47,7 @@ fn verify_i32_is_greater_than_other_i32_fails() { assert_eq!( failures, - &[r"assertion failed: expected my_thing to be greater than 42 + &[r"expected my_thing to be greater than 42 but was: 42 expected: > 42 "] @@ -72,7 +72,7 @@ fn verify_i32_is_at_most_other_i32_fails() { assert_eq!( failures, - &[r"assertion failed: expected my_thing to be at most 41 + &[r"expected my_thing to be at most 41 but was: 42 expected: <= 41 "] @@ -97,7 +97,7 @@ fn verify_i32_is_at_least_other_i32_fails() { assert_eq!( failures, - &[r"assertion failed: expected my_thing to be at least 43 + &[r"expected my_thing to be at least 43 but was: 42 expected: >= 43 "] @@ -126,7 +126,7 @@ fn verify_char_is_less_than_other_char_fails() { assert_eq!( failures, - &[r"assertion failed: expected my_thing to be less than 'C' + &[r"expected my_thing to be less than 'C' but was: 'C' expected: < 'C' "] @@ -151,7 +151,7 @@ fn verify_char_is_greater_than_other_char_fails() { assert_eq!( failures, - &[r"assertion failed: expected my_thing to be greater than 'D' + &[r"expected my_thing to be greater than 'D' but was: 'D' expected: > 'D' "] @@ -176,7 +176,7 @@ fn verify_char_is_at_most_other_char_fails() { assert_eq!( failures, - &[r"assertion failed: expected my_thing to be at most 'B' + &[r"expected my_thing to be at most 'B' but was: 'C' expected: <= 'B' "] @@ -201,7 +201,7 @@ fn verify_char_is_at_least_other_char_fails() { assert_eq!( failures, - &[r"assertion failed: expected my_thing to be at least 'E' + &[r"expected my_thing to be at least 'E' but was: 'D' expected: >= 'E' "] @@ -226,7 +226,7 @@ fn verify_char_is_before_other_char_fails() { assert_eq!( failures, - &[r"assertion failed: expected my_thing to be before 'L' + &[r"expected my_thing to be before 'L' but was: 'L' expected: < 'L' "] @@ -251,7 +251,7 @@ fn verify_char_is_after_other_char_fails() { assert_eq!( failures, - &[r"assertion failed: expected my_thing to be after 'L' + &[r"expected my_thing to be after 'L' but was: 'L' expected: > 'L' "] @@ -278,12 +278,10 @@ fn verify_char_is_between_a_min_char_and_a_max_char_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to be between 'M' and 'P' + &[r"expected my_thing to be between 'M' and 'P' but was: 'L' expected: 'M' <= x <= 'P' -" - ] +"] ); } @@ -302,12 +300,10 @@ mod colored { assert_eq!( failures, - &[ - "assertion failed: expected subject to be less than 3.779\n \ + &["expected subject to be less than 3.779\n \ but was: \u{1b}[31m3.781\u{1b}[0m\n \ expected: < \u{1b}[32m3.779\u{1b}[0m\n\ - " - ] + "] ); } @@ -322,12 +318,10 @@ mod colored { assert_eq!( failures, - &[ - "assertion failed: expected subject to be at most 3.779\n \ + &["expected subject to be at most 3.779\n \ but was: \u{1b}[31m3.781\u{1b}[0m\n \ expected: <= \u{1b}[34m3.779\u{1b}[0m\n\ - " - ] + "] ); } @@ -342,12 +336,10 @@ mod colored { assert_eq!( failures, - &[ - "assertion failed: expected subject to be greater than 3.782\n \ + &["expected subject to be greater than 3.782\n \ but was: \u{1b}[31m3.781\u{1b}[0m\n \ expected: > \u{1b}[33m3.782\u{1b}[0m\n\ - " - ] + "] ); } @@ -362,12 +354,10 @@ mod colored { assert_eq!( failures, - &[ - "assertion failed: expected subject to be at least 3.782\n \ + &["expected subject to be at least 3.782\n \ but was: \u{1b}[31m3.781\u{1b}[0m\n \ expected: >= \u{1b}[34m3.782\u{1b}[0m\n\ - " - ] + "] ); } @@ -382,12 +372,10 @@ mod colored { assert_eq!( failures, - &[ - "assertion failed: expected subject to be between 'M' and 'P'\n \ + &["expected subject to be between 'M' and 'P'\n \ but was: \u{1b}[31m'L'\u{1b}[0m\n \ expected: \u{1b}[33m'M'\u{1b}[0m <= x <= 'P'\n\ - " - ] + "] ); } @@ -402,12 +390,10 @@ mod colored { assert_eq!( failures, - &[ - "assertion failed: expected subject to be between 'H' and 'K'\n \ + &["expected subject to be between 'H' and 'K'\n \ but was: \u{1b}[31m'L'\u{1b}[0m\n \ expected: 'H' <= x <= \u{1b}[33m'K'\u{1b}[0m\n\ - " - ] + "] ); } } diff --git a/src/panic/tests.rs b/src/panic/tests.rs index fb9d033..53f54d8 100644 --- a/src/panic/tests.rs +++ b/src/panic/tests.rs @@ -21,11 +21,9 @@ fn verify_code_does_not_panic_fails() { assert_eq!( failures, - &[ - r#"assertion failed: expected my_closure to not panic, but did panic + &[r#"expected my_closure to not panic, but did panic with message: "excepteur stet sadipscing eu" -"# - ] +"#] ); } @@ -52,9 +50,7 @@ fn code_does_panic_with_message_from_assertion() { .with_diff_format(DIFF_FORMAT_NO_HIGHLIGHT) .is_equal_to(4); }) - .panics_with_message( - "assertion failed: expected subject to be equal to 4\n but was: 5\n expected: 4\n", - ); + .panics_with_message("expected subject to be equal to 4\n but was: 5\n expected: 4\n"); } #[test] @@ -76,10 +72,8 @@ fn verify_code_does_panic_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_closure to panic, but did not panic -" - ] + &[r"expected my_closure to panic, but did not panic +"] ); } @@ -95,7 +89,7 @@ fn verify_code_does_panic_with_message_fails_because_code_does_not_panic() { assert_eq!( failures, &[ - r#"assertion failed: expected my_closure to panic with message "nam veniam ut et", + r#"expected my_closure to panic with message "nam veniam ut et", but did not panic "# ] @@ -116,8 +110,8 @@ fn verify_code_does_panic_with_message_fails_because_unexpected_panic_message() assert_eq!( failures, &[ - "assertion failed: expected my_closure to panic with message \"lobortis lorem aliquam ex\"\n \ - but was: \"assertion failed: expected subject to be equal to 4\n but was: 5\n expected: 4\n\"\n \ + "expected my_closure to panic with message \"lobortis lorem aliquam ex\"\n \ + but was: \"expected subject to be equal to 4\n but was: 5\n expected: 4\n\"\n \ expected: \"lobortis lorem aliquam ex\"\n\ " ] @@ -145,7 +139,7 @@ mod colored { assert_eq!( failures, &[ - "assertion failed: expected foo to not panic, but \u{1b}[31mdid panic\u{1b}[0m\n \ + "expected foo to not panic, but \u{1b}[31mdid panic\u{1b}[0m\n \ with message: \"\u{1b}[31mfoo does not work with message\u{1b}[0m\"\n\ " ] @@ -162,7 +156,7 @@ mod colored { assert_eq!( failures, - &["assertion failed: expected foo to panic, but \u{1b}[31mdid not panic\u{1b}[0m\n"] + &["expected foo to panic, but \u{1b}[31mdid not panic\u{1b}[0m\n"] ); } @@ -176,8 +170,10 @@ mod colored { assert_eq!( failures, - &["assertion failed: expected foo to panic with message \"hendrerit sint tempor ipsum\",\n \ - but \u{1b}[31mdid not panic\u{1b}[0m\n"] + &[ + "expected foo to panic with message \"hendrerit sint tempor ipsum\",\n \ + but \u{1b}[31mdid not panic\u{1b}[0m\n" + ] ); } @@ -191,7 +187,8 @@ mod colored { assert_eq!( failures, - &["assertion failed: expected foo to panic with message \"hendrerit sint tempor ipsum\"\n \ + &[ + "expected foo to panic with message \"hendrerit sint tempor ipsum\"\n \ but was: \"\u{1b}[31mfoo does not work with message\u{1b}[0m\"\n \ expected: \"\u{1b}[32mhendrerit sint tempor ipsum\u{1b}[0m\"\n\ " diff --git a/src/predicate/tests.rs b/src/predicate/tests.rs index 99d5e46..6ee8c15 100644 --- a/src/predicate/tests.rs +++ b/src/predicate/tests.rs @@ -20,7 +20,7 @@ fn verify_that_subject_satisfies_predicate_fails() { assert_eq!( failures, - &["assertion failed: expected my_thing to satisfy the given predicate, but returned false\n"] + &["expected my_thing to satisfy the given predicate, but returned false\n"] ); } @@ -35,8 +35,5 @@ fn verify_that_subject_satisfies_predicate_fails_with_custom_message() { }) .display_failures(); - assert_eq!( - failures, - &["assertion failed: the answer to all important questions is 42\n"] - ); + assert_eq!(failures, &["the answer to all important questions is 42\n"]); } diff --git a/src/range/tests.rs b/src/range/tests.rs index bc5a72d..b16bf9a 100644 --- a/src/range/tests.rs +++ b/src/range/tests.rs @@ -22,12 +22,10 @@ fn verify_i32_is_in_range_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to be within range of 43..51 + &[r"expected my_thing to be within range of 43..51 but was: 42 expected: 43 <= x < 51 -" - ] +"] ); } @@ -49,12 +47,10 @@ fn verify_i32_is_in_inclusive_range_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to be within range of 43..=51 + &[r"expected my_thing to be within range of 43..=51 but was: 42 expected: 43 <= x <= 51 -" - ] +"] ); } @@ -76,12 +72,10 @@ fn verify_i32_is_in_range_from_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to be within range of 43.. + &[r"expected my_thing to be within range of 43.. but was: 42 expected: 43 <= x < .. -" - ] +"] ); } @@ -103,12 +97,10 @@ fn verify_i32_is_in_range_to_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to be within range of ..42 + &[r"expected my_thing to be within range of ..42 but was: 42 expected: .. < x < 42 -" - ] +"] ); } @@ -130,12 +122,10 @@ fn verify_i32_is_in_range_to_inclusive_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to be within range of ..=41 + &[r"expected my_thing to be within range of ..=41 but was: 42 expected: .. < x <= 41 -" - ] +"] ); } @@ -157,12 +147,10 @@ fn verify_i32_is_not_in_range_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to be not within range of 41..43 + &[r"expected my_thing to be not within range of 41..43 but was: 42 expected: x < 41 || x >= 43 -" - ] +"] ); } @@ -184,12 +172,10 @@ fn verify_i32_is_not_in_inclusive_range_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to be not within range of 41..=42 + &[r"expected my_thing to be not within range of 41..=42 but was: 42 expected: x < 41 || x > 42 -" - ] +"] ); } @@ -211,12 +197,10 @@ fn verify_i32_is_not_in_range_from_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to be not within range of 42.. + &[r"expected my_thing to be not within range of 42.. but was: 42 expected: x < 42 || x > .. -" - ] +"] ); } @@ -238,12 +222,10 @@ fn verify_i32_is_not_in_range_to_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to be not within range of ..43 + &[r"expected my_thing to be not within range of ..43 but was: 42 expected: x < .. || x >= 43 -" - ] +"] ); } @@ -265,12 +247,10 @@ fn verify_i32_is_not_in_range_to_inclusive_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to be not within range of ..=42 + &[r"expected my_thing to be not within range of ..=42 but was: 42 expected: x < .. || x > 42 -" - ] +"] ); } @@ -296,12 +276,10 @@ fn verify_char_is_in_range_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to be within range of 'L'..'Z' + &[r"expected my_thing to be within range of 'L'..'Z' but was: 'K' expected: 'L' <= x < 'Z' -" - ] +"] ); } @@ -323,12 +301,10 @@ fn verify_char_is_in_inclusive_range_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to be within range of 'L'..='Z' + &[r"expected my_thing to be within range of 'L'..='Z' but was: 'K' expected: 'L' <= x <= 'Z' -" - ] +"] ); } @@ -350,12 +326,10 @@ fn verify_char_is_not_in_range_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to be not within range of 'J'..'L' + &[r"expected my_thing to be not within range of 'J'..'L' but was: 'K' expected: x < 'J' || x >= 'L' -" - ] +"] ); } @@ -377,12 +351,10 @@ fn verify_char_is_not_in_inclusive_range_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to be not within range of 'J'..='K' + &[r"expected my_thing to be not within range of 'J'..='K' but was: 'K' expected: x < 'J' || x > 'K' -" - ] +"] ); } @@ -434,12 +406,10 @@ mod colored { assert_eq!( failures, - &[ - "assertion failed: expected subject to be within range of -4321..4322\n \ + &["expected subject to be within range of -4321..4322\n \ but was: \u{1b}[31m29834\u{1b}[0m\n \ expected: -4321 <= x < \u{1b}[34m4322\u{1b}[0m\n\ - " - ] + "] ); } @@ -454,12 +424,10 @@ mod colored { assert_eq!( failures, - &[ - "assertion failed: expected subject to be within range of -4321..4322\n \ + &["expected subject to be within range of -4321..4322\n \ but was: \u{1b}[31m-29834\u{1b}[0m\n \ expected: \u{1b}[34m-4321\u{1b}[0m <= x < 4322\n\ - " - ] + "] ); } @@ -474,12 +442,10 @@ mod colored { assert_eq!( failures, - &[ - "assertion failed: expected subject to be within range of -4321..=4321\n \ + &["expected subject to be within range of -4321..=4321\n \ but was: \u{1b}[31m29834\u{1b}[0m\n \ expected: -4321 <= x <= \u{1b}[34m4321\u{1b}[0m\n\ - " - ] + "] ); } @@ -494,12 +460,10 @@ mod colored { assert_eq!( failures, - &[ - "assertion failed: expected subject to be within range of -4321..=4321\n \ + &["expected subject to be within range of -4321..=4321\n \ but was: \u{1b}[31m-29834\u{1b}[0m\n \ expected: \u{1b}[34m-4321\u{1b}[0m <= x <= 4321\n\ - " - ] + "] ); } @@ -514,12 +478,10 @@ mod colored { assert_eq!( failures, - &[ - "assertion failed: expected subject to be not within range of 'a'..'p'\n \ + &["expected subject to be not within range of 'a'..'p'\n \ but was: \u{1b}[31m'm'\u{1b}[0m\n \ expected: x < \u{1b}[32m'a'\u{1b}[0m || x >= \u{1b}[32m'p'\u{1b}[0m\n\ - " - ] + "] ); } @@ -534,12 +496,10 @@ mod colored { assert_eq!( failures, - &[ - "assertion failed: expected subject to be not within range of 'a'..='z'\n \ + &["expected subject to be not within range of 'a'..='z'\n \ but was: \u{1b}[31m'm'\u{1b}[0m\n \ expected: x < \u{1b}[32m'a'\u{1b}[0m || x > \u{1b}[32m'z'\u{1b}[0m\n\ - " - ] + "] ); } } diff --git a/src/result/mod.rs b/src/result/mod.rs index 8b91293..7e1c61a 100644 --- a/src/result/mod.rs +++ b/src/result/mod.rs @@ -56,7 +56,7 @@ where self.mapping(|subject| match subject { Ok(value) => value, Err(error) => { - panic!("assertion failed: expected the subject to be `Ok(_)`, but was `Err({error:?})`") + panic!("expected the subject to be `Ok(_)`, but was `Err({error:?})`") }, }) } @@ -64,7 +64,7 @@ where fn err(self) -> Spec<'a, E, R> { self.mapping(|subject| match subject { Ok(value) => { - panic!("assertion failed: expected the subject to be `Err(_)`, but was `Ok({value:?})`") + panic!("expected the subject to be `Err(_)`, but was `Ok({value:?})`") }, Err(error) => error, }) @@ -80,7 +80,7 @@ where self.mapping(|subject| match subject { Ok(value) => value, Err(error) => { - panic!("assertion failed: expected the subject to be `Ok(_)`, but was `Err({error:?})`") + panic!("expected the subject to be `Ok(_)`, but was `Err({error:?})`") }, }) } @@ -88,7 +88,7 @@ where fn err(self) -> Spec<'a, &'a E, R> { self.mapping(|subject| match subject { Ok(value) => { - panic!("assertion failed: expected the subject to be `Err(_)`, but was `Ok({value:?})`") + panic!("expected the subject to be `Err(_)`, but was `Ok({value:?})`") }, Err(error) => error, }) @@ -154,7 +154,7 @@ where fn has_error_message(self, expected: X) -> Spec<'a, String, R> { self.mapping(|result| match result { Ok(value) => panic!( - r"assertion failed: expected the subject to be `Err(_)` with message {expected:?}, but was `Ok({value:?})`" + r"expected the subject to be `Err(_)` with message {expected:?}, but was `Ok({value:?})`" ), Err(error) => { error.to_string() @@ -174,7 +174,7 @@ where fn has_error_message(self, expected: X) -> Spec<'a, String, R> { self.mapping(|result| match result { Ok(value) => panic!( - r"assertion failed: expected the subject to be `Err(_)` with message {expected:?}, but was `Ok({value:?})`" + r"expected the subject to be `Err(_)` with message {expected:?}, but was `Ok({value:?})`" ), Err(error) => { error.to_string() diff --git a/src/result/tests.rs b/src/result/tests.rs index af67edf..b0656cc 100644 --- a/src/result/tests.rs +++ b/src/result/tests.rs @@ -58,7 +58,7 @@ fn verify_result_of_custom_types_is_ok_fails() { assert_eq!( failures, - &[r#"assertion failed: expected my_thing to be Ok(_) + &[r#"expected my_thing to be Ok(_) but was: Err(MyError("aute nam ad amet")) expected: Ok(_) "#] @@ -83,7 +83,7 @@ fn verify_result_of_custom_types_is_err_fails() { assert_eq!( failures, - &[r"assertion failed: expected my_thing to be Err(_) + &[r"expected my_thing to be Err(_) but was: Ok(MyValue(42)) expected: Err(_) "] @@ -135,7 +135,7 @@ fn verify_result_of_custom_types_has_value_fails() { assert_eq!( failures, &[ - r#"assertion failed: expected my_thing to be ok containing MyValue("sea non obcaecat nostrud") + r#"expected my_thing to be ok containing MyValue("sea non obcaecat nostrud") but was: Err(MyError("amet esse rebum feugait")) expected: Ok(MyValue("sea non obcaecat nostrud")) "# @@ -161,12 +161,10 @@ fn verify_result_of_custom_types_has_error_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to be an error containing MyError(-1) + &[r"expected my_thing to be an error containing MyError(-1) but was: Ok(MyValue(42)) expected: Err(MyError(-1)) -" - ] +"] ); } @@ -214,7 +212,7 @@ fn verify_borrowed_result_of_custom_types_is_ok_fails() { assert_eq!( failures, - &[r#"assertion failed: expected my_thing to be Ok(_) + &[r#"expected my_thing to be Ok(_) but was: Err(MyError("aute nam ad amet")) expected: Ok(_) "#] @@ -239,7 +237,7 @@ fn verify_borrowed_result_of_custom_types_is_err_fails() { assert_eq!( failures, - &[r"assertion failed: expected my_thing to be Err(_) + &[r"expected my_thing to be Err(_) but was: Ok(MyValue(42)) expected: Err(_) "] @@ -291,7 +289,7 @@ fn verify_borrowed_result_of_custom_types_has_value_fails() { assert_eq!( failures, &[ - r#"assertion failed: expected my_thing to be ok containing MyValue("sea non obcaecat nostrud") + r#"expected my_thing to be ok containing MyValue("sea non obcaecat nostrud") but was: Err(MyError("amet esse rebum feugait")) expected: Ok(MyValue("sea non obcaecat nostrud")) "# @@ -317,12 +315,10 @@ fn verify_borrowed_result_of_custom_types_has_error_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to be an error containing MyError(-1) + &[r"expected my_thing to be an error containing MyError(-1) but was: Ok(MyValue(42)) expected: Err(MyError(-1)) -" - ] +"] ); } @@ -341,7 +337,9 @@ fn map_result_with_err_value_to_its_ok_value() { assert_that_code(|| { assert_that(subject).ok().is_not_empty(); }) - .panics_with_message("assertion failed: expected the subject to be `Ok(_)`, but was `Err(\"nam nihil iure liber\")`"); + .panics_with_message( + "expected the subject to be `Ok(_)`, but was `Err(\"nam nihil iure liber\")`", + ); } #[test] @@ -359,9 +357,7 @@ fn map_result_with_ok_value_to_its_err_value() { assert_that_code(|| { assert_that(subject).err().is_not_empty(); }) - .panics_with_message( - "assertion failed: expected the subject to be `Err(_)`, but was `Ok([1, 2, 3])`", - ); + .panics_with_message("expected the subject to be `Err(_)`, but was `Ok([1, 2, 3])`"); } #[test] @@ -379,7 +375,9 @@ fn map_borrowed_result_with_err_value_to_its_ok_value() { assert_that_code(|| { assert_that(&subject).ok().is_not_empty(); }) - .panics_with_message("assertion failed: expected the subject to be `Ok(_)`, but was `Err(\"nam nihil iure liber\")`"); + .panics_with_message( + "expected the subject to be `Ok(_)`, but was `Err(\"nam nihil iure liber\")`", + ); } #[test] @@ -397,9 +395,7 @@ fn map_borrowed_result_with_ok_value_to_its_err_value() { assert_that_code(|| { assert_that(&subject).err().is_not_empty(); }) - .panics_with_message( - "assertion failed: expected the subject to be `Err(_)`, but was `Ok([1, 2, 3])`", - ); + .panics_with_message("expected the subject to be `Err(_)`, but was `Ok([1, 2, 3])`"); } #[test] @@ -434,7 +430,7 @@ fn verify_result_error_has_message_for_ok_value() { assert_that_code(|| { assert_that(subject).has_error_message("vulputate voluptate sanctus quod"); }).panics_with_message( - r#"assertion failed: expected the subject to be `Err(_)` with message "vulputate voluptate sanctus quod", but was `Ok(())`"#, + r#"expected the subject to be `Err(_)` with message "vulputate voluptate sanctus quod", but was `Ok(())`"#, ); } @@ -470,7 +466,7 @@ fn verify_borrowed_result_error_has_message_for_ok_value() { assert_that_code(|| { assert_that(&subject).has_error_message("vulputate voluptate sanctus quod"); }).panics_with_message( - r#"assertion failed: expected the subject to be `Err(_)` with message "vulputate voluptate sanctus quod", but was `Ok(())`"#, + r#"expected the subject to be `Err(_)` with message "vulputate voluptate sanctus quod", but was `Ok(())`"#, ); } @@ -494,7 +490,7 @@ mod colored { assert_eq!( failures, - &["assertion failed: expected subject to be Ok(_)\n \ + &["expected subject to be Ok(_)\n \ but was: \u{1b}[31mErr(\"esse augue id esse\")\u{1b}[0m\n \ expected: \u{1b}[34mOk(_)\u{1b}[0m\n\ "] @@ -512,7 +508,7 @@ mod colored { assert_eq!( failures, - &["assertion failed: expected subject to be Err(_)\n \ + &["expected subject to be Err(_)\n \ but was: \u{1b}[31mOk(3500)\u{1b}[0m\n \ expected: \u{1b}[32mErr(_)\u{1b}[0m\n\ "] @@ -530,12 +526,10 @@ mod colored { assert_eq!( failures, - &[ - "assertion failed: expected subject to be ok containing [1, 2, 3, 5, 7]\n \ + &["expected subject to be ok containing [1, 2, 3, 5, 7]\n \ but was: \u{1b}[31mErr(\"minim facer liber kasd\")\u{1b}[0m\n \ expected: \u{1b}[33mOk([1, 2, 3, 5, 7])\u{1b}[0m\n\ - " - ] + "] ); } @@ -551,7 +545,7 @@ mod colored { assert_eq!( failures, &[ - "assertion failed: expected subject to be an error containing \"at feugait nihil qui\"\n \ + "expected subject to be an error containing \"at feugait nihil qui\"\n \ but was: \u{1b}[31mOk([1, 2, 3, 5, 7])\u{1b}[0m\n \ expected: \u{1b}[33mErr(\"at feugait nihil qui\")\u{1b}[0m\n\ " diff --git a/src/rust_decimal/tests.rs b/src/rust_decimal/tests.rs index dca5cc1..5d6154e 100644 --- a/src/rust_decimal/tests.rs +++ b/src/rust_decimal/tests.rs @@ -22,7 +22,7 @@ fn verify_decimal_is_equal_to_other_fails() { assert_eq!( failures, - &[r"assertion failed: expected subject to be equal to -42.831 + &[r"expected subject to be equal to -42.831 but was: 42.831 expected: -42.831 "] @@ -168,12 +168,10 @@ fn verify_decimal_has_precision_of_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected subject to have a precision of 7 + &[r"expected subject to have a precision of 7 but was: 29 expected: 7 -" - ] +"] ); } @@ -210,7 +208,7 @@ fn verify_decimal_has_scale_of_fails() { assert_eq!( failures, - &[r"assertion failed: expected subject to have a scale of 5 + &[r"expected subject to have a scale of 5 but was: 2 expected: 5 "] @@ -239,7 +237,7 @@ fn verify_decimal_is_integer_fails() { assert_eq!( failures, - &[r"assertion failed: expected subject to be an integer value + &[r"expected subject to be an integer value but was: 4208.10 expected: an integer value "] diff --git a/src/slice/tests.rs b/src/slice/tests.rs index c3089be..9a9c950 100644 --- a/src/slice/tests.rs +++ b/src/slice/tests.rs @@ -31,12 +31,10 @@ fn verify_slice_is_equal_to_another_slice_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to be equal to [2, 4, 6, 8] + &[r"expected my_thing to be equal to [2, 4, 6, 8] but was: [1, 3, 5, 7] expected: [2, 4, 6, 8] -" - ] +"] ); } @@ -93,12 +91,10 @@ fn verify_slice_has_length_less_than_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to have a length less than 6 + &[r"expected my_thing to have a length less than 6 but was: 6 expected: < 6 -" - ] +"] ); } @@ -120,12 +116,10 @@ fn verify_slice_has_length_greater_than_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to have a length greater than 6 + &[r"expected my_thing to have a length greater than 6 but was: 6 expected: > 6 -" - ] +"] ); } @@ -148,12 +142,10 @@ fn verify_slice_has_at_most_length_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to have at most a length of 5 + &[r"expected my_thing to have at most a length of 5 but was: 6 expected: <= 5 -" - ] +"] ); } @@ -176,12 +168,10 @@ fn verify_slice_has_at_least_length_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to have at least a length of 7 + &[r"expected my_thing to have at least a length of 7 but was: 6 expected: >= 7 -" - ] +"] ); } @@ -206,7 +196,7 @@ fn verify_slice_contains_fails() { assert_eq!( failures, - &[r"assertion failed: expected my_thing to contain 21 + &[r"expected my_thing to contain 21 but was: [1, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43] expected: 21 "] @@ -234,7 +224,7 @@ fn verify_slice_iterator_contains_fails() { assert_eq!( failures, - &[r"assertion failed: expected my_thing to contain 21 + &[r"expected my_thing to contain 21 but was: [1, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43] expected: 21 "] @@ -262,7 +252,7 @@ fn verify_slice_does_not_contain_fails() { assert_eq!( failures, - &[r"assertion failed: expected my_thing to not contain 19 + &[r"expected my_thing to not contain 19 but was: [1, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43] expected: not 19 "] @@ -290,7 +280,7 @@ fn verify_slice_iterator_does_not_contain_fails() { assert_eq!( failures, - &[r"assertion failed: expected my_thing to not contain 19 + &[r"expected my_thing to not contain 19 but was: [1, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43] expected: not 19 "] @@ -318,7 +308,7 @@ fn verify_slice_contains_exactly_in_any_order_fails() { assert_eq!( failures, &[ - r"assertion failed: expected my_thing to contain exactly in any order [0, 1, 3, 5, 7, 11, 11, 13, 17, 19, 23, 29, 31, 37, 41] + r"expected my_thing to contain exactly in any order [0, 1, 3, 5, 7, 11, 11, 13, 17, 19, 23, 29, 31, 37, 41] but was: [5, 7, 11, 13, 1, 11, 3, 17, 23, 23, 29, 31, 41, 37, 43] expected: [0, 1, 3, 5, 7, 11, 11, 13, 17, 19, 23, 29, 31, 37, 41] missing: [0, 19] @@ -347,7 +337,7 @@ fn verify_slice_contains_any_of_fails() { assert_eq!( failures, &[ - r"assertion failed: expected my_thing to contain any of [0, 2, 4, 8, 16, 32, 64] + r"expected my_thing to contain any of [0, 2, 4, 8, 16, 32, 64] but was: [5, 7, 11, 13, 1, 11, 3, 17, 23, 23, 29, 31, 41, 37, 43] expected: [0, 2, 4, 8, 16, 32, 64] " @@ -374,7 +364,7 @@ fn verify_slice_does_not_contain_any_of_fails() { assert_eq!( failures, &[ - r"assertion failed: expected my_thing to not contain any of [0, 2, 4, 41, 16, 32, 64] + r"expected my_thing to not contain any of [0, 2, 4, 41, 16, 32, 64] but was: [5, 7, 11, 13, 1, 11, 3, 17, 23, 23, 29, 31, 41, 37, 43] expected: not [0, 2, 4, 41, 16, 32, 64] " @@ -401,7 +391,7 @@ fn verify_slice_contains_all_of_fails() { assert_eq!( failures, &[ - r"assertion failed: expected my_thing to contain all of [5, 18, 3, 17, 45, 1, 1, 29, 0] + r"expected my_thing to contain all of [5, 18, 3, 17, 45, 1, 1, 29, 0] but was: [5, 7, 11, 13, 1, 11, 3, 17, 23, 23, 29, 31, 41, 37, 43] expected: [5, 18, 3, 17, 45, 1, 1, 29, 0] missing: [18, 45, 0] @@ -428,13 +418,11 @@ fn verify_slice_contains_only_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to contain only [1, 3, 7, 11, 19] + &[r"expected my_thing to contain only [1, 3, 7, 11, 19] but was: [5, 11, 1, 3, 19, 17, 11, 43] expected: [1, 3, 7, 11, 19] extra: [5, 17, 43] -" - ] +"] ); } @@ -456,14 +444,12 @@ fn verify_slice_contains_only_once_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to contain only once [1, 3, 7, 11, 19] + &[r"expected my_thing to contain only once [1, 3, 7, 11, 19] but was: [5, 11, 1, 3, 3, 19, 17, 11, 3, 43] expected: [1, 3, 7, 11, 19] extra: [5, 17, 43] duplicates: [11, 3, 3, 11, 3] -" - ] +"] ); } @@ -514,7 +500,7 @@ fn verify_slice_contains_exactly_fails_out_of_order() { assert_eq!( failures, &[ - r#"assertion failed: expected my_thing to contain exactly in order ["two", "two", "one", "three", "four", "five", "six", "seven", "four", "eight", "nine"] + r#"expected my_thing to contain exactly in order ["two", "two", "one", "three", "four", "five", "six", "seven", "four", "eight", "nine"] but was: ["one", "two", "two", "three", "four", "five", "six", "four", "seven", "eight", "nine"] expected: ["two", "two", "one", "three", "four", "five", "six", "seven", "four", "eight", "nine"] missing: [] @@ -554,7 +540,7 @@ fn verify_slice_contains_exactly_fails_missing_and_extra() { assert_eq!( failures, &[ - r#"assertion failed: expected my_thing to contain exactly in order ["one", "two", "two", "three", "four", "five", "six", "six", "seven", "four", "eight", "nine"] + r#"expected my_thing to contain exactly in order ["one", "two", "two", "three", "four", "five", "six", "six", "seven", "four", "eight", "nine"] but was: ["one", "two", "six", "three", "four", "five", "six", "six", "seven", "eleven", "eight", "nine", "ten"] expected: ["one", "two", "two", "three", "four", "five", "six", "six", "seven", "four", "eight", "nine"] missing: ["two", "four"] @@ -592,7 +578,7 @@ fn verify_slice_contains_exactly_fails_expected_longer_than_vec() { assert_eq!( failures, &[ - r#"assertion failed: expected my_thing to contain exactly in order ["one", "two", "two", "three", "four", "five", "six", "four", "seven", "eight", "nine", "ten"] + r#"expected my_thing to contain exactly in order ["one", "two", "two", "three", "four", "five", "six", "four", "seven", "eight", "nine", "ten"] but was: ["one", "two", "two", "three", "four", "five", "six", "four", "seven", "eight", "nine"] expected: ["one", "two", "two", "three", "four", "five", "six", "four", "seven", "eight", "nine", "ten"] missing: ["ten"] @@ -655,7 +641,7 @@ fn verify_slice_contains_sequence_fails() { assert_eq!( failures, &[ - r#"assertion failed: expected my_thing to contain the sequence ["two", "three", "four", "five", "six", "six", "four"] + r#"expected my_thing to contain the sequence ["two", "three", "four", "five", "six", "six", "four"] but was: ["one", "two", "two", "three", "four", "five", "six", "four", "two", "seven", "two", "three", "five", "four", "six", "four", "eight", "nine", "ten"] expected: ["two", "three", "four", "five", "six", "six", "four"] missing: ["six", "four"] @@ -684,7 +670,7 @@ fn verify_slice_contains_sequence_fails_expected_longer_than_vec() { assert_eq!( failures, &[ - r#"assertion failed: expected my_thing to contain the sequence ["one", "two", "three", "four", "five", "six", "seven"] + r#"expected my_thing to contain the sequence ["one", "two", "three", "four", "five", "six", "seven"] but was: ["one", "two", "three", "four", "five", "six"] expected: ["one", "two", "three", "four", "five", "six", "seven"] missing: ["seven"] @@ -749,7 +735,7 @@ fn verify_slice_contains_all_in_order_fails() { assert_eq!( failures, &[ - r#"assertion failed: expected my_thing to contain all of ["one", "two", "two", "seven", "two", "three", "six", "six", "ten"] in order + r#"expected my_thing to contain all of ["one", "two", "two", "seven", "two", "three", "six", "six", "ten"] in order but was: ["one", "two", "two", "three", "four", "five", "six", "four", "two", "seven", "two", "three", "five", "four", "six", "four", "eight", "nine", "ten"] expected: ["one", "two", "two", "seven", "two", "three", "six", "six", "ten"] missing: ["six"] @@ -797,14 +783,12 @@ fn verify_vec_starts_with_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to start with [13, 5, 7, 1, 19] + &[r"expected my_thing to start with [13, 5, 7, 1, 19] but was: [13, 5, 7, 19, 1, 3, 11, 29, 23, 31, 37] expected: [13, 5, 7, 1, 19] missing: [1, 19] extra: [19, 1] -" - ] +"] ); } @@ -820,7 +804,7 @@ fn verify_empty_vec_starts_with_expected_sequence_longer_than_vec_fails() { assert_eq!( failures, &[ - r"assertion failed: expected my_thing to start with [13, 5, 7, 19, 1, 3, 11, 29, 23, 31, 37] + r"expected my_thing to start with [13, 5, 7, 19, 1, 3, 11, 29, 23, 31, 37] but was: [13, 5, 7, 19, 1, 3, 11, 29, 23, 31] expected: [13, 5, 7, 19, 1, 3, 11, 29, 23, 31, 37] missing: [37] @@ -869,14 +853,12 @@ fn verify_vec_ends_with_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to end with [11, 23, 23, 31, 73] + &[r"expected my_thing to end with [11, 23, 23, 31, 73] but was: [13, 5, 7, 19, 1, 3, 11, 29, 23, 31, 37] expected: [11, 23, 23, 31, 73] missing: [23, 73] extra: [29, 37] -" - ] +"] ); } @@ -892,7 +874,7 @@ fn verify_empty_vec_ends_with_expected_sequence_longer_than_vec_fails() { assert_eq!( failures, &[ - r"assertion failed: expected my_thing to end with [41, 13, 5, 7, 19, 1, 3, 11, 29, 23, 31] + r"expected my_thing to end with [41, 13, 5, 7, 19, 1, 3, 11, 29, 23, 31] but was: [13, 5, 7, 19, 1, 3, 11, 29, 23, 31] expected: [41, 13, 5, 7, 19, 1, 3, 11, 29, 23, 31] missing: [41] @@ -917,7 +899,7 @@ mod colored { assert_eq!( failures, - &["assertion failed: expected subject to contain 21\n \ + &["expected subject to contain 21\n \ but was: [\u{1b}[31m13\u{1b}[0m, \u{1b}[31m5\u{1b}[0m, \u{1b}[31m7\u{1b}[0m, \u{1b}[31m19\u{1b}[0m, \u{1b}[31m1\u{1b}[0m, \u{1b}[31m3\u{1b}[0m, \u{1b}[31m11\u{1b}[0m, \u{1b}[31m29\u{1b}[0m, \u{1b}[31m23\u{1b}[0m, \u{1b}[31m31\u{1b}[0m, \u{1b}[31m37\u{1b}[0m]\n \ expected: \u{1b}[32m21\u{1b}[0m\n\ "] @@ -935,7 +917,7 @@ mod colored { assert_eq!( failures, - &["assertion failed: expected subject to not contain 19\n \ + &["expected subject to not contain 19\n \ but was: [13, 5, 7, \u{1b}[31m19\u{1b}[0m, 1, 3, 11, 29, \u{1b}[31m19\u{1b}[0m, \u{1b}[31m19\u{1b}[0m, 37]\n \ expected: not \u{1b}[32m19\u{1b}[0m\n\ "] @@ -952,7 +934,7 @@ mod colored { .display_failures(); assert_eq!(failures, &[ - "assertion failed: expected subject to contain exactly in any order [1, 2, 3, 13, 8, 7, 12, 15, 31, 19, 20, 11, 31]\n \ + "expected subject to contain exactly in any order [1, 2, 3, 13, 8, 7, 12, 15, 31, 19, 20, 11, 31]\n \ but was: [13, \u{1b}[31m5\u{1b}[0m, 7, 19, 1, 3, 11, \u{1b}[31m29\u{1b}[0m, \u{1b}[31m23\u{1b}[0m, 31, \u{1b}[31m37\u{1b}[0m]\n \ expected: [1, \u{1b}[34m2\u{1b}[0m, 3, 13, \u{1b}[34m8\u{1b}[0m, 7, \u{1b}[34m12\u{1b}[0m, \u{1b}[34m15\u{1b}[0m, 31, 19, \u{1b}[34m20\u{1b}[0m, 11, \u{1b}[34m31\u{1b}[0m]\n \ missing: [2, 8, 12, 15, 20, 31]\n \ @@ -971,7 +953,7 @@ mod colored { .display_failures(); assert_eq!(failures, &[ - "assertion failed: expected subject to contain any of [2, 4, 6, 8, 9, 10, 12, 15, 32, 20, 18]\n \ + "expected subject to contain any of [2, 4, 6, 8, 9, 10, 12, 15, 32, 20, 18]\n \ but was: [\u{1b}[31m13\u{1b}[0m, \u{1b}[31m5\u{1b}[0m, \u{1b}[31m7\u{1b}[0m, \u{1b}[31m19\u{1b}[0m, \u{1b}[31m1\u{1b}[0m, \u{1b}[31m3\u{1b}[0m, \u{1b}[31m11\u{1b}[0m, \u{1b}[31m29\u{1b}[0m, \u{1b}[31m23\u{1b}[0m, \u{1b}[31m31\u{1b}[0m, \u{1b}[31m37\u{1b}[0m]\n \ expected: [\u{1b}[34m2\u{1b}[0m, \u{1b}[34m4\u{1b}[0m, \u{1b}[34m6\u{1b}[0m, \u{1b}[34m8\u{1b}[0m, \u{1b}[34m9\u{1b}[0m, \u{1b}[34m10\u{1b}[0m, \u{1b}[34m12\u{1b}[0m, \u{1b}[34m15\u{1b}[0m, \u{1b}[34m32\u{1b}[0m, \u{1b}[34m20\u{1b}[0m, \u{1b}[34m18\u{1b}[0m]\n\ " @@ -988,7 +970,7 @@ mod colored { .display_failures(); assert_eq!(failures, &[ - "assertion failed: expected subject to not contain any of [2, 4, 6, 8, 9, 10, 11, 15, 32, 20, 18]\n \ + "expected subject to not contain any of [2, 4, 6, 8, 9, 10, 11, 15, 32, 20, 18]\n \ but was: [13, 5, 7, 19, \u{1b}[31m11\u{1b}[0m, \u{1b}[31m11\u{1b}[0m, 3, \u{1b}[31m11\u{1b}[0m, 29, 23, 31, 37]\n \ expected: not [2, 4, 6, 8, 9, 10, \u{1b}[34m11\u{1b}[0m, 15, 32, 20, 18]\n\ " @@ -1005,7 +987,7 @@ mod colored { .display_failures(); assert_eq!(failures, &[ - "assertion failed: expected subject to contain all of [2, 3, 5, 20, 11, 13, 19, 37, 22]\n \ + "expected subject to contain all of [2, 3, 5, 20, 11, 13, 19, 37, 22]\n \ but was: [13, 5, \u{1b}[31m7\u{1b}[0m, 19, \u{1b}[31m1\u{1b}[0m, 3, 11, \u{1b}[31m29\u{1b}[0m, \u{1b}[31m23\u{1b}[0m, \u{1b}[31m31\u{1b}[0m, 37]\n \ expected: [\u{1b}[34m2\u{1b}[0m, 3, 5, \u{1b}[34m20\u{1b}[0m, 11, 13, 19, 37, \u{1b}[34m22\u{1b}[0m]\n \ missing: [2, 20, 22]\n\ @@ -1023,7 +1005,7 @@ mod colored { .display_failures(); assert_eq!(failures, &[ - "assertion failed: expected subject to contain only [13, 3, 5, 20, 11, 13, 19, 37, 22]\n \ + "expected subject to contain only [13, 3, 5, 20, 11, 13, 19, 37, 22]\n \ but was: [13, 5, \u{1b}[31m7\u{1b}[0m, 19, \u{1b}[31m1\u{1b}[0m, 3, 11, \u{1b}[31m29\u{1b}[0m, \u{1b}[31m23\u{1b}[0m, \u{1b}[31m31\u{1b}[0m, 37]\n \ expected: [13, 3, 5, \u{1b}[34m20\u{1b}[0m, 11, 13, 19, 37, \u{1b}[34m22\u{1b}[0m]\n \ extra: [7, 1, 29, 23, 31]\n\ @@ -1043,7 +1025,7 @@ mod colored { assert_eq!( failures, &[ - "assertion failed: expected subject to contain only once [1, 3, 7, 11, 19]\n \ + "expected subject to contain only once [1, 3, 7, 11, 19]\n \ but was: [\u{1b}[31m5\u{1b}[0m, \u{1b}[31m11\u{1b}[0m, 1, \u{1b}[31m3\u{1b}[0m, \u{1b}[31m3\u{1b}[0m, 19, \u{1b}[31m17\u{1b}[0m, \u{1b}[31m11\u{1b}[0m, \u{1b}[31m3\u{1b}[0m, \u{1b}[31m43\u{1b}[0m]\n \ expected: [1, \u{1b}[34m3\u{1b}[0m, \u{1b}[34m7\u{1b}[0m, \u{1b}[34m11\u{1b}[0m, 19]\n \ extra: [5, 17, 43]\n \ @@ -1063,7 +1045,7 @@ mod colored { .display_failures(); assert_eq!(failures, &[ - "assertion failed: expected subject to contain exactly in order [13, 20, 5, 19, 11, 29, 8, 1, 23, 31, 41]\n \ + "expected subject to contain exactly in order [13, 20, 5, 19, 11, 29, 8, 1, 23, 31, 41]\n \ but was: [13, \u{1b}[31m5\u{1b}[0m, \u{1b}[31m7\u{1b}[0m, 19, \u{1b}[31m1\u{1b}[0m, \u{1b}[31m3\u{1b}[0m, \u{1b}[31m11\u{1b}[0m, \u{1b}[31m29\u{1b}[0m, 23, 31, \u{1b}[31m37\u{1b}[0m]\n \ expected: [13, \u{1b}[33m20\u{1b}[0m, \u{1b}[33m5\u{1b}[0m, 19, \u{1b}[33m11\u{1b}[0m, \u{1b}[33m29\u{1b}[0m, \u{1b}[33m8\u{1b}[0m, \u{1b}[33m1\u{1b}[0m, 23, 31, \u{1b}[33m41\u{1b}[0m]\n \ missing: [20, 8, 41]\n \ @@ -1085,7 +1067,7 @@ mod colored { assert_eq!( failures, &[ - "assertion failed: expected subject to contain the sequence [19, 3, 7, 11, 29]\n \ + "expected subject to contain the sequence [19, 3, 7, 11, 29]\n \ but was: [13, 5, 7, 19, \u{1b}[31m1\u{1b}[0m, \u{1b}[31m3\u{1b}[0m, 11, 29, 23, 31, 37]\n \ expected: [19, \u{1b}[33m3\u{1b}[0m, \u{1b}[33m7\u{1b}[0m, 11, 29]\n \ missing: [3, 7]\n \ @@ -1107,7 +1089,7 @@ mod colored { assert_eq!( failures, &[ - "assertion failed: expected subject to contain all of [13, 3, 7, 22, 11, 20, 29, 37] in order\n \ + "expected subject to contain all of [13, 3, 7, 22, 11, 20, 29, 37] in order\n \ but was: [13, 5, 7, 19, 1, 3, 11, 29, 23, 31, 37]\n \ expected: [13, 3, \u{1b}[33m7\u{1b}[0m, \u{1b}[33m22\u{1b}[0m, 11, \u{1b}[33m20\u{1b}[0m, 29, 37]\n \ missing: [7, 22, 20]\n\ @@ -1128,7 +1110,7 @@ mod colored { assert_eq!( failures, &[ - "assertion failed: expected subject to start with [13, 5, 8, 19, 4]\n \ + "expected subject to start with [13, 5, 8, 19, 4]\n \ but was: [13, 5, \u{1b}[31m7\u{1b}[0m, 19, \u{1b}[31m1\u{1b}[0m, 3, 11, 29, 23, 31, 37]\n \ expected: [13, 5, \u{1b}[33m8\u{1b}[0m, 19, \u{1b}[33m4\u{1b}[0m]\n \ missing: [8, 4]\n \ @@ -1150,7 +1132,7 @@ mod colored { assert_eq!( failures, &[ - "assertion failed: expected subject to end with [3, 11, 28, 29, 30, 37]\n \ + "expected subject to end with [3, 11, 28, 29, 30, 37]\n \ but was: [13, 5, 7, 19, 1, 3, 11, \u{1b}[31m29\u{1b}[0m, \u{1b}[31m23\u{1b}[0m, \u{1b}[31m31\u{1b}[0m, 37]\n \ expected: [3, 11, \u{1b}[33m28\u{1b}[0m, \u{1b}[33m29\u{1b}[0m, \u{1b}[33m30\u{1b}[0m, 37]\n \ missing: [28, 29, 30]\n \ diff --git a/src/spec/mod.rs b/src/spec/mod.rs index 8a74593..0f7f0a1 100644 --- a/src/spec/mod.rs +++ b/src/spec/mod.rs @@ -173,7 +173,7 @@ macro_rules! assert_that_code { /// .display_failures(); /// /// assert_that!(failures).contains_exactly([ -/// r#"assertion failed: expected || { divide(7, 0); } to not panic, but did panic +/// r#"expected || { divide(7, 0); } to not panic, but did panic /// with message: "attempt to divide by zero" /// "# /// ]); @@ -183,7 +183,7 @@ macro_rules! assert_that_code { /// .display_failures(); /// /// assert_that!(failures).contains_exactly([ -/// r#"assertion failed: expected || { divide(7, 0); } to panic with message "division by zero" +/// r#"expected || { divide(7, 0); } to panic with message "division by zero" /// but was: "attempt to divide by zero" /// expected: "division by zero" /// "# @@ -296,11 +296,11 @@ pub fn assert_that<'a, S>(subject: S) -> Spec<'a, S, PanicOnFail> { /// .display_failures(); /// /// assert_that!(failures).contains_exactly([ -/// r#"assertion failed: expected my_thing to start with "nibh" +/// r#"expected my_thing to start with "nibh" /// but was: "vel tempor augue delenit" /// expected: "nibh" /// "#, -/// r#"assertion failed: expected my_thing to end with "magna" +/// r#"expected my_thing to end with "magna" /// but was: "vel tempor augue delenit" /// expected: "magna" /// "#, @@ -393,7 +393,7 @@ where /// .display_failures(); /// /// assert_that!(failures).contains_exactly([ -/// r#"assertion failed: expected the closure to not panic, but did panic +/// r#"expected the closure to not panic, but did panic /// with message: "attempt to divide by zero" /// "# /// ]); @@ -403,7 +403,7 @@ where /// .display_failures(); /// /// assert_that!(failures).contains_exactly([ -/// r#"assertion failed: expected the closure to panic with message "division by zero" +/// r#"expected the closure to panic with message "division by zero" /// but was: "attempt to divide by zero" /// expected: "division by zero" /// "# @@ -910,7 +910,7 @@ where /// let failures = verify_that!(22).satisfies(is_odd).display_failures(); /// /// assert_that!(failures).contains_exactly([ - /// "assertion failed: expected 22 to satisfy the given predicate, but returned false\n" + /// "expected 22 to satisfy the given predicate, but returned false\n" /// ]); /// ``` /// @@ -952,7 +952,7 @@ where /// .display_failures(); /// /// assert_that!(failures).contains_exactly([ - /// "assertion failed: expected my number to be odd\n" + /// "expected my number to be odd\n" /// ]); /// ``` /// @@ -1016,11 +1016,11 @@ impl Spec<'_, S, CollectFailures> { /// assertions in the panic message: /// /// ```console - /// assertion failed: expected subject to contain "unimportant" + /// expected subject to contain "unimportant" /// but was: "the answer to all important questions is 42" /// expected: "unimportant" /// - /// assertion failed: expected subject to have at most a length of 41 + /// expected subject to have at most a length of 41 /// but was: 43 /// expected: <= 41 /// ``` @@ -1079,15 +1079,15 @@ impl<'a, I, R> Spec<'a, I, R> { /// will print: /// /// ```console - /// assertion failed: expected numbers 1. item to be greater than 2 + /// expected numbers 1. item to be greater than 2 /// but was: 2 /// expected: > 2 /// - /// assertion failed: expected numbers 4. item to be at most 7 + /// expected numbers 4. item to be at most 7 /// but was: 8 /// expected: <= 7 /// - /// assertion failed: expected numbers 5. item to be at most 7 + /// expected numbers 5. item to be at most 7 /// but was: 10 /// expected: <= 7 /// ``` @@ -1145,10 +1145,10 @@ impl Display for AssertFailure { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match &self.description { None => { - writeln!(f, "assertion failed: {}", &self.message)?; + writeln!(f, "{}", &self.message)?; }, Some(description) => { - writeln!(f, "assertion failed: {description}\n{}", &self.message)?; + writeln!(f, "{description}\n{}", &self.message)?; }, } Ok(()) diff --git a/src/spec/tests.rs b/src/spec/tests.rs index 3abbbe1..4270f67 100644 --- a/src/spec/tests.rs +++ b/src/spec/tests.rs @@ -57,8 +57,9 @@ fn assert_failure_display_format() { location: Some(OwnedLocation::new("src/thing_module/thing_test.rs", 54, 13)), }; - assert_that!(format!("{}", failure)) - .is_equal_to("assertion failed: this thing is the best\nbut this thing is the worst\ninstead it should be the best\n"); + assert_that!(format!("{}", failure)).is_equal_to( + "this thing is the best\nbut this thing is the worst\ninstead it should be the best\n", + ); } #[test] @@ -120,7 +121,7 @@ fn assert_that_macro_with_borrowed_str_subject() { #[test] #[should_panic( - expected = "assertion failed: expected ultimate_answer to be equal to 42\n but was: 51\n expected: 42\n" + expected = "expected ultimate_answer to be equal to 42\n but was: 51\n expected: 42\n" )] fn assert_that_macro_is_equal_to_with_integers_fails() { let ultimate_answer = 51; @@ -149,11 +150,11 @@ fn verify_that_option_is_some_chained_with_has_value_fails_as_none() { assert_eq!( failures, &[ - r"assertion failed: expected my_variable to be Some(_) + r"expected my_variable to be Some(_) but was: None expected: Some(_) ", - r"assertion failed: expected my_variable to be some containing 42 + r"expected my_variable to be some containing 42 but was: None expected: Some(42) ", @@ -172,13 +173,11 @@ fn verify_that_a_subject_with_custom_description_is_equal_to_fails() { assert_eq!( failures, - &[ - r"assertion failed: the answer to all important questions is 42 + &[r"the answer to all important questions is 42 expected subject to be equal to 42 but was: 51 expected: 42 -" - ] +"] ); } @@ -194,13 +193,11 @@ fn verify_that_a_subject_with_custom_name_and_custom_description_is_equal_to_fai assert_eq!( failures, - &[ - r"assertion failed: the answer to all important questions is 42 + &[r"the answer to all important questions is 42 expected answer to be equal to 42 but was: 51 expected: 42 -" - ] +"] ); } @@ -215,11 +212,11 @@ fn soft_assertions_with_chained_assertion_methods() { } #[test] -#[should_panic = "assertion failed: expected subject to contain \"unimportant\"\n \ +#[should_panic = "expected subject to contain \"unimportant\"\n \ but was: \"the answer to all important questions is 42\"\n \ expected: \"unimportant\"\n\ \n\ - assertion failed: expected subject to have at most a length of 41\n \ + expected subject to have at most a length of 41\n \ but was: 43\n \ expected: <= 41\n\ "] @@ -251,7 +248,7 @@ fn assert_each_item_of_a_borrowed_iterator() { } #[test] -#[should_panic = "assertion failed: expected numbers 2. item to be not equal to 4\n but was: 4\n expected: not 4\n"] +#[should_panic = "expected numbers 2. item to be not equal to 4\n but was: 4\n expected: not 4\n"] fn assert_each_item_of_an_iterator_panics_if_one_assertion_fails() { let subject = [2, 4, 6, 8, 10]; @@ -273,15 +270,15 @@ fn verify_assert_each_item_of_an_iterator_fails() { assert_eq!( failures, &[ - r"assertion failed: expected numbers 1. item to be greater than 2 + r"expected numbers 1. item to be greater than 2 but was: 2 expected: > 2 ", - r"assertion failed: expected numbers 4. item to be at most 7 + r"expected numbers 4. item to be at most 7 but was: 8 expected: <= 7 ", - r"assertion failed: expected numbers 5. item to be at most 7 + r"expected numbers 5. item to be at most 7 but was: 10 expected: <= 7 ", @@ -294,11 +291,11 @@ mod colored { use crate::prelude::*; #[test] - #[should_panic = "assertion failed: expected subject to contain \"unimportant\"\n \ + #[should_panic = "expected subject to contain \"unimportant\"\n \ but was: \"\u{1b}[31mthe answer to all important questions is 42\u{1b}[0m\"\n \ expected: \"\u{1b}[32munimportant\u{1b}[0m\"\n\ \n\ - assertion failed: expected subject to have at most a length of 41\n \ + expected subject to have at most a length of 41\n \ but was: \u{1b}[31m43\u{1b}[0m\n \ expected: <= \u{1b}[32m41\u{1b}[0m\n\ "] diff --git a/src/string/tests.rs b/src/string/tests.rs index d173450..e69e602 100644 --- a/src/string/tests.rs +++ b/src/string/tests.rs @@ -83,7 +83,7 @@ fn verify_string_is_equal_to_str_fails() { assert_eq!( failures, &[ - r#"assertion failed: expected my_thing to be equal to "aute duis eleifend molestie" + r#"expected my_thing to be equal to "aute duis eleifend molestie" but was: "" expected: "aute duis eleifend molestie" "# @@ -144,7 +144,7 @@ fn verify_str_is_empty_fails() { assert_eq!( failures, - &[r#"assertion failed: expected my_thing to be empty + &[r#"expected my_thing to be empty but was: "ABC" expected: "#] @@ -162,7 +162,7 @@ fn verify_string_is_not_empty_fails() { assert_eq!( failures, - &[r#"assertion failed: expected my_thing to be not empty + &[r#"expected my_thing to be not empty but was: "" expected: "#] @@ -201,7 +201,7 @@ fn verify_str_has_length_fails() { assert_eq!( failures, - &[r"assertion failed: expected my_thing to have a length of 29 + &[r"expected my_thing to have a length of 29 but was: 28 expected: 29 "] @@ -226,12 +226,10 @@ fn verify_has_length_in_range_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to have a length within range 1..25 + &[r"expected my_thing to have a length within range 1..25 but was: 25 expected: 1..25 -" - ] +"] ); } @@ -253,12 +251,10 @@ fn verify_has_length_in_inclusive_range_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to have a length within range 1..=24 + &[r"expected my_thing to have a length within range 1..=24 but was: 25 expected: 1..=24 -" - ] +"] ); } @@ -280,12 +276,10 @@ fn verify_string_has_length_less_than_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to have a length less than 25 + &[r"expected my_thing to have a length less than 25 but was: 25 expected: < 25 -" - ] +"] ); } @@ -307,12 +301,10 @@ fn verify_string_has_length_greater_than_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to have a length greater than 28 + &[r"expected my_thing to have a length greater than 28 but was: 28 expected: > 28 -" - ] +"] ); } @@ -335,12 +327,10 @@ fn verify_string_has_at_most_length_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to have at most a length of 29 + &[r"expected my_thing to have at most a length of 29 but was: 30 expected: <= 29 -" - ] +"] ); } @@ -363,12 +353,10 @@ fn verify_string_has_at_least_length_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to have at least a length of 22 + &[r"expected my_thing to have at least a length of 22 but was: 21 expected: >= 22 -" - ] +"] ); } @@ -415,12 +403,10 @@ fn verify_str_has_char_count_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to have a char count of 7 + &[r"expected my_thing to have a char count of 7 but was: 5 expected: 7 -" - ] +"] ); } @@ -463,12 +449,10 @@ fn verify_str_has_char_count_in_range_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to have a char count within 6..12 + &[r"expected my_thing to have a char count within 6..12 but was: 5 expected: 6..12 -" - ] +"] ); } @@ -490,12 +474,10 @@ fn verify_str_has_char_count_in_inclusive_range_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to have a char count within 6..=12 + &[r"expected my_thing to have a char count within 6..=12 but was: 5 expected: 6..=12 -" - ] +"] ); } @@ -517,12 +499,10 @@ fn verify_string_has_char_count_less_than_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to have a char count less than 7 + &[r"expected my_thing to have a char count less than 7 but was: 7 expected: < 7 -" - ] +"] ); } @@ -544,12 +524,10 @@ fn verify_string_has_char_count_greater_than_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to have a char count greater than 7 + &[r"expected my_thing to have a char count greater than 7 but was: 7 expected: > 7 -" - ] +"] ); } @@ -572,12 +550,10 @@ fn verify_string_has_at_most_char_count_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to have at most a char count of 6 + &[r"expected my_thing to have at most a char count of 6 but was: 7 expected: <= 6 -" - ] +"] ); } @@ -600,12 +576,10 @@ fn verify_string_has_at_least_char_count_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to have at least a char count of 8 + &[r"expected my_thing to have at least a char count of 8 but was: 7 expected: >= 8 -" - ] +"] ); } @@ -655,12 +629,10 @@ fn verify_string_contains_other_str_fails() { assert_eq!( failures, - &[ - r#"assertion failed: expected my_thing to contain "not a substring" + &[r#"expected my_thing to contain "not a substring" but was: "invidunt eos hendrerit commodo" expected: "not a substring" -"# - ] +"#] ); } @@ -675,12 +647,10 @@ fn verify_string_contains_other_string_fails() { assert_eq!( failures, - &[ - r#"assertion failed: expected my_thing to contain "not a substring" + &[r#"expected my_thing to contain "not a substring" but was: "invidunt eos hendrerit commodo" expected: "not a substring" -"# - ] +"#] ); } @@ -695,7 +665,7 @@ fn verify_string_contains_char_fails() { assert_eq!( failures, - &[r#"assertion failed: expected my_thing to contain 'Q' + &[r#"expected my_thing to contain 'Q' but was: "consectetur ex hendrerit officia" expected: 'Q' "#] @@ -734,12 +704,10 @@ fn verify_str_contains_any_char_of_a_slice_of_chars_fails() { assert_eq!( failures, - &[ - r#"assertion failed: expected my_thing to contain any of ['x', 'y', 'z'] + &[r#"expected my_thing to contain any of ['x', 'y', 'z'] but was: "luptatum in nihil laoreet" expected: ['x', 'y', 'z'] -"# - ] +"#] ); } @@ -754,12 +722,10 @@ fn verify_string_contains_any_char_of_an_array_of_chars_fails() { assert_eq!( failures, - &[ - r#"assertion failed: expected my_thing to contain any of ['x', 'y', 'z'] + &[r#"expected my_thing to contain any of ['x', 'y', 'z'] but was: "luptatum in nihil laoreet" expected: ['x', 'y', 'z'] -"# - ] +"#] ); } @@ -774,12 +740,10 @@ fn verify_str_contains_any_char_of_a_borrowed_array_of_chars_fails() { assert_eq!( failures, - &[ - r#"assertion failed: expected my_thing to contain any of ['x', 'y', 'z'] + &[r#"expected my_thing to contain any of ['x', 'y', 'z'] but was: "luptatum in nihil laoreet" expected: ['x', 'y', 'z'] -"# - ] +"#] ); } @@ -829,12 +793,10 @@ fn verify_string_does_not_contain_other_str_fails() { assert_eq!( failures, - &[ - r#"assertion failed: expected my_thing to not contain " eos " + &[r#"expected my_thing to not contain " eos " but was: "invidunt eos hendrerit commodo" expected: not " eos " -"# - ] +"#] ); } @@ -849,12 +811,10 @@ fn verify_string_does_not_contain_other_string_fails() { assert_eq!( failures, - &[ - r#"assertion failed: expected my_thing to not contain "eos hend" + &[r#"expected my_thing to not contain "eos hend" but was: "invidunt eos hendrerit commodo" expected: not "eos hend" -"# - ] +"#] ); } @@ -869,7 +829,7 @@ fn verify_string_does_not_contain_char_fails() { assert_eq!( failures, - &[r#"assertion failed: expected my_thing to not contain 'x' + &[r#"expected my_thing to not contain 'x' but was: "consectetur ex hendrerit officia" expected: not 'x' "#] @@ -908,12 +868,10 @@ fn verify_str_does_not_contain_any_char_of_a_slice_of_chars_fails() { assert_eq!( failures, - &[ - r#"assertion failed: expected my_thing to not contain any of ['x', 'n', 'z'] + &[r#"expected my_thing to not contain any of ['x', 'n', 'z'] but was: "luptatum in nihil laoreet" expected: not ['x', 'n', 'z'] -"# - ] +"#] ); } @@ -928,12 +886,10 @@ fn verify_string_does_not_contain_any_char_of_an_array_of_chars_fails() { assert_eq!( failures, - &[ - r#"assertion failed: expected my_thing to not contain any of ['d', 'k', 'n'] + &[r#"expected my_thing to not contain any of ['d', 'k', 'n'] but was: "luptatum in nihil laoreet" expected: not ['d', 'k', 'n'] -"# - ] +"#] ); } @@ -948,12 +904,10 @@ fn verify_str_does_not_contain_any_char_of_a_borrowed_array_of_chars_fails() { assert_eq!( failures, - &[ - r#"assertion failed: expected my_thing to not contain any of ['u', 'a', 'l'] + &[r#"expected my_thing to not contain any of ['u', 'a', 'l'] but was: "luptatum in nihil laoreet" expected: not ['u', 'a', 'l'] -"# - ] +"#] ); } @@ -1010,12 +964,10 @@ fn verify_string_starts_with_str_fails() { assert_eq!( failures, - &[ - r#"assertion failed: expected my_thing to start with "false start" + &[r#"expected my_thing to start with "false start" but was: "possim deserunt obcaecat hendrerit" expected: "false start" -"# - ] +"#] ); } @@ -1030,12 +982,10 @@ fn verify_string_starts_with_string_fails() { assert_eq!( failures, - &[ - r#"assertion failed: expected my_thing to start with "false start" + &[r#"expected my_thing to start with "false start" but was: "possim deserunt obcaecat hendrerit" expected: "false start" -"# - ] +"#] ); } @@ -1050,7 +1000,7 @@ fn verify_string_starts_with_char_fails() { assert_eq!( failures, - &[r#"assertion failed: expected my_thing to start with 'X' + &[r#"expected my_thing to start with 'X' but was: "possim deserunt obcaecat hendrerit" expected: 'X' "#] @@ -1110,12 +1060,10 @@ fn verify_string_ends_with_str_fails() { assert_eq!( failures, - &[ - r#"assertion failed: expected my_thing to end with "abrupt end" + &[r#"expected my_thing to end with "abrupt end" but was: "possim deserunt obcaecat hendrerit" expected: "abrupt end" -"# - ] +"#] ); } @@ -1130,12 +1078,10 @@ fn verify_string_ends_with_string_fails() { assert_eq!( failures, - &[ - r#"assertion failed: expected my_thing to end with "abrupt end" + &[r#"expected my_thing to end with "abrupt end" but was: "possim deserunt obcaecat hendrerit" expected: "abrupt end" -"# - ] +"#] ); } @@ -1150,7 +1096,7 @@ fn verify_string_ends_with_char_fails() { assert_eq!( failures, - &[r#"assertion failed: expected my_thing to end with 'Z' + &[r#"expected my_thing to end with 'Z' but was: "possim deserunt obcaecat hendrerit" expected: 'Z' "#] @@ -1210,12 +1156,10 @@ fn verify_string_does_not_start_with_str_fails() { assert_eq!( failures, - &[ - r#"assertion failed: expected my_thing to not start with "possim des" + &[r#"expected my_thing to not start with "possim des" but was: "possim deserunt obcaecat hendrerit" expected: not "possim des" -"# - ] +"#] ); } @@ -1230,12 +1174,10 @@ fn verify_string_does_not_start_with_string_fails() { assert_eq!( failures, - &[ - r#"assertion failed: expected my_thing to not start with "poss" + &[r#"expected my_thing to not start with "poss" but was: "possim deserunt obcaecat hendrerit" expected: not "poss" -"# - ] +"#] ); } @@ -1250,7 +1192,7 @@ fn verify_string_does_not_start_with_char_fails() { assert_eq!( failures, - &[r#"assertion failed: expected my_thing to not start with 'p' + &[r#"expected my_thing to not start with 'p' but was: "possim deserunt obcaecat hendrerit" expected: not 'p' "#] @@ -1310,12 +1252,10 @@ fn verify_string_does_not_end_with_str_fails() { assert_eq!( failures, - &[ - r#"assertion failed: expected my_thing to not end with "rerit" + &[r#"expected my_thing to not end with "rerit" but was: "possim deserunt obcaecat hendrerit" expected: not "rerit" -"# - ] +"#] ); } @@ -1330,12 +1270,10 @@ fn verify_string_does_not_end_with_string_fails() { assert_eq!( failures, - &[ - r#"assertion failed: expected my_thing to not end with "caecat hendrerit" + &[r#"expected my_thing to not end with "caecat hendrerit" but was: "possim deserunt obcaecat hendrerit" expected: not "caecat hendrerit" -"# - ] +"#] ); } @@ -1350,7 +1288,7 @@ fn verify_string_does_not_end_with_char_fails() { assert_eq!( failures, - &[r#"assertion failed: expected my_thing to not end with 't' + &[r#"expected my_thing to not end with 't' but was: "possim deserunt obcaecat hendrerit" expected: not 't' "#] @@ -1379,12 +1317,10 @@ mod regex { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to match the regex \b\w{12}\b + &[r"expected my_thing to match the regex \b\w{12}\b but was: volutpat lobortis aliquam diam does not match regex: \b\w{12}\b -" - ] +"] ); } @@ -1407,7 +1343,7 @@ mod regex { assert_eq!( failures, &[ - r"assertion failed: expected my_thing to not match the regex ^[a-zA-Z0-9 ]{8,32}$ + r"expected my_thing to not match the regex ^[a-zA-Z0-9 ]{8,32}$ but was: volutpat lobortis aliquam diam does match regex: ^[a-zA-Z0-9 ]{8,32}$ " @@ -1455,7 +1391,7 @@ mod colored { assert_eq!( failures, &[ - "assertion failed: expected subject to be equal to \"invi wisi exercitation anim placerat\"\n \ + "expected subject to be equal to \"invi wisi exercitation anim placerat\"\n \ but was: \"invi\u{1b}[31mdunt\u{1b}[0m wisi \u{1b}[31mfacilisis \u{1b}[0mexercitation\"\n \ expected: \"invi wisi exercitation\u{1b}[34m anim placerat\u{1b}[0m\"\n\ " @@ -1472,10 +1408,12 @@ mod colored { assert_eq!( failures, - &["assertion failed: expected subject to be not equal to \"aute aliquip culpa blandit\"\n \ + &[ + "expected subject to be not equal to \"aute aliquip culpa blandit\"\n \ but was: \"aute aliquip culpa blandit\"\n \ expected: not \"aute aliquip culpa blandit\"\n\ - "] + " + ] ); } @@ -1490,7 +1428,7 @@ mod colored { assert_eq!( failures, - &["assertion failed: expected subject to be empty\n \ + &["expected subject to be empty\n \ but was: \u{1b}[31m\"voluptua quod quis dignissim\"\u{1b}[0m\n \ expected: \n\ "] @@ -1508,7 +1446,7 @@ mod colored { assert_eq!( failures, - &["assertion failed: expected subject to be not empty\n \ + &["expected subject to be not empty\n \ but was: \u{1b}[31m\"\"\u{1b}[0m\n \ expected: \n\ "] @@ -1526,12 +1464,10 @@ mod colored { assert_eq!( failures, - &[ - "assertion failed: expected subject to have a length of 29\n \ + &["expected subject to have a length of 29\n \ but was: \u{1b}[31m23\u{1b}[0m\n \ expected: \u{1b}[32m29\u{1b}[0m\n\ - " - ] + "] ); } @@ -1546,12 +1482,10 @@ mod colored { assert_eq!( failures, - &[ - "assertion failed: expected subject to have a length within range 8..=20\n \ + &["expected subject to have a length within range 8..=20\n \ but was: \u{1b}[31m26\u{1b}[0m\n \ expected: \u{1b}[32m8..=20\u{1b}[0m\n\ - " - ] + "] ); } @@ -1566,12 +1500,10 @@ mod colored { assert_eq!( failures, - &[ - "assertion failed: expected subject to contain \"status\"\n \ + &["expected subject to contain \"status\"\n \ but was: \"\u{1b}[31msanctus stet eiusmod odio\u{1b}[0m\"\n \ expected: \"\u{1b}[33mstatus\u{1b}[0m\"\n\ - " - ] + "] ); } @@ -1586,12 +1518,10 @@ mod colored { assert_eq!( failures, - &[ - "assertion failed: expected subject to contain \"status\"\n \ + &["expected subject to contain \"status\"\n \ but was: \"\u{1b}[31msanctus stet eiusmod odio\u{1b}[0m\"\n \ expected: \"\u{1b}[33mstatus\u{1b}[0m\"\n\ - " - ] + "] ); } @@ -1606,7 +1536,7 @@ mod colored { assert_eq!( failures, - &["assertion failed: expected subject to contain 'E'\n \ + &["expected subject to contain 'E'\n \ but was: \"\u{1b}[31msanctus stet eiusmod odio\u{1b}[0m\"\n \ expected: '\u{1b}[33mE\u{1b}[0m'\n\ "] @@ -1624,12 +1554,10 @@ mod colored { assert_eq!( failures, - &[ - "assertion failed: expected subject to not contain \"stet eius\"\n \ + &["expected subject to not contain \"stet eius\"\n \ but was: \"sanctus \u{1b}[31mstet eius\u{1b}[0mmod odio\"\n \ expected: not \"\u{1b}[33mstet eius\u{1b}[0m\"\n\ - " - ] + "] ); } @@ -1644,12 +1572,10 @@ mod colored { assert_eq!( failures, - &[ - "assertion failed: expected subject to not contain \"stet eius\"\n \ + &["expected subject to not contain \"stet eius\"\n \ but was: \"sanctus \u{1b}[31mstet eius\u{1b}[0mmod odio\"\n \ expected: not \"\u{1b}[33mstet eius\u{1b}[0m\"\n\ - " - ] + "] ); } @@ -1664,7 +1590,7 @@ mod colored { assert_eq!( failures, - &["assertion failed: expected subject to not contain 't'\n \ + &["expected subject to not contain 't'\n \ but was: \"sanc\u{1b}[31mt\u{1b}[0mus s\u{1b}[31mt\u{1b}[0me\u{1b}[31mtt\u{1b}[0m eiusmod odio\"\n \ expected: not '\u{1b}[33mt\u{1b}[0m'\n\ "] @@ -1682,12 +1608,10 @@ mod colored { assert_eq!( failures, - &[ - "assertion failed: expected subject to start with \"una\"\n \ + &["expected subject to start with \"una\"\n \ but was: \"\u{1b}[31mnul\u{1b}[0mla feugiat illum culpa\"\n \ expected: \"\u{1b}[32muna\u{1b}[0m\"\n\ - " - ] + "] ); } @@ -1702,12 +1626,10 @@ mod colored { assert_eq!( failures, - &[ - "assertion failed: expected subject to start with \"una\"\n \ + &["expected subject to start with \"una\"\n \ but was: \"\u{1b}[31mnul\u{1b}[0mla feugiat illum culpa\"\n \ expected: \"\u{1b}[32muna\u{1b}[0m\"\n\ - " - ] + "] ); } @@ -1722,12 +1644,10 @@ mod colored { assert_eq!( failures, - &[ - "assertion failed: expected subject to not start with \"null\"\n \ + &["expected subject to not start with \"null\"\n \ but was: \"\u{1b}[31mnull\u{1b}[0ma feugiat illum culpa\"\n \ expected: not \"\u{1b}[32mnull\u{1b}[0m\"\n\ - " - ] + "] ); } @@ -1742,12 +1662,10 @@ mod colored { assert_eq!( failures, - &[ - "assertion failed: expected subject to not start with \"null\"\n \ + &["expected subject to not start with \"null\"\n \ but was: \"\u{1b}[31mnull\u{1b}[0ma feugiat illum culpa\"\n \ expected: not \"\u{1b}[32mnull\u{1b}[0m\"\n\ - " - ] + "] ); } @@ -1762,7 +1680,7 @@ mod colored { assert_eq!( failures, - &["assertion failed: expected subject to start with 'o'\n \ + &["expected subject to start with 'o'\n \ but was: \"\u{1b}[31mc\u{1b}[0mommodo sadipscing id imperdiet\"\n \ expected: '\u{1b}[32mo\u{1b}[0m'\n\ "] @@ -1780,12 +1698,10 @@ mod colored { assert_eq!( failures, - &[ - "assertion failed: expected subject to not start with 'c'\n \ + &["expected subject to not start with 'c'\n \ but was: \"\u{1b}[31mc\u{1b}[0mommodo sadipscing id imperdiet\"\n \ expected: not '\u{1b}[32mc\u{1b}[0m'\n\ - " - ] + "] ); } @@ -1800,12 +1716,10 @@ mod colored { assert_eq!( failures, - &[ - "assertion failed: expected subject to end with \"innocence\"\n \ + &["expected subject to end with \"innocence\"\n \ but was: \"nulla feugiat il\u{1b}[31mlum culpa\u{1b}[0m\"\n \ expected: \"\u{1b}[32minnocence\u{1b}[0m\"\n\ - " - ] + "] ); } @@ -1820,12 +1734,10 @@ mod colored { assert_eq!( failures, - &[ - "assertion failed: expected subject to end with \"innocence\"\n \ + &["expected subject to end with \"innocence\"\n \ but was: \"nulla feugiat il\u{1b}[31mlum culpa\u{1b}[0m\"\n \ expected: \"\u{1b}[32minnocence\u{1b}[0m\"\n\ - " - ] + "] ); } @@ -1840,12 +1752,10 @@ mod colored { assert_eq!( failures, - &[ - "assertion failed: expected subject to not end with \"um culpa\"\n \ + &["expected subject to not end with \"um culpa\"\n \ but was: \"nulla feugiat ill\u{1b}[31mum culpa\u{1b}[0m\"\n \ expected: not \"\u{1b}[32mum culpa\u{1b}[0m\"\n\ - " - ] + "] ); } @@ -1860,12 +1770,10 @@ mod colored { assert_eq!( failures, - &[ - "assertion failed: expected subject to not end with \"lpa\"\n \ + &["expected subject to not end with \"lpa\"\n \ but was: \"nulla feugiat illum cu\u{1b}[31mlpa\u{1b}[0m\"\n \ expected: not \"\u{1b}[32mlpa\u{1b}[0m\"\n\ - " - ] + "] ); } @@ -1880,7 +1788,7 @@ mod colored { assert_eq!( failures, - &["assertion failed: expected subject to end with 'e'\n \ + &["expected subject to end with 'e'\n \ but was: \"commodo sadipscing id imperdie\u{1b}[31mt\u{1b}[0m\"\n \ expected: '\u{1b}[32me\u{1b}[0m'\n\ "] @@ -1898,12 +1806,10 @@ mod colored { assert_eq!( failures, - &[ - "assertion failed: expected subject to not end with 't'\n \ + &["expected subject to not end with 't'\n \ but was: \"commodo sadipscing id imperdie\u{1b}[31mt\u{1b}[0m\"\n \ expected: not '\u{1b}[32mt\u{1b}[0m'\n\ - " - ] + "] ); } @@ -1918,12 +1824,10 @@ mod colored { assert_eq!( failures, - &[ - "assertion failed: expected subject to contain any of ['a', 'b', 'c']\n \ + &["expected subject to contain any of ['a', 'b', 'c']\n \ but was: \"\u{1b}[31mproident tempor est sed\u{1b}[0m\"\n \ expected: \u{1b}[34m['a', 'b', 'c']\u{1b}[0m\n\ - " - ] + "] ); } @@ -1938,12 +1842,10 @@ mod colored { assert_eq!( failures, - &[ - "assertion failed: expected subject to contain any of ['a', 'b', 'c']\n \ + &["expected subject to contain any of ['a', 'b', 'c']\n \ but was: \"\u{1b}[31mproident tempor est sed\u{1b}[0m\"\n \ expected: \u{1b}[34m['a', 'b', 'c']\u{1b}[0m\n\ - " - ] + "] ); } @@ -1958,12 +1860,10 @@ mod colored { assert_eq!( failures, - &[ - "assertion failed: expected subject to contain any of ['a', 'b', 'c']\n \ + &["expected subject to contain any of ['a', 'b', 'c']\n \ but was: \"\u{1b}[31mproident tempor est sed\u{1b}[0m\"\n \ expected: \u{1b}[34m['a', 'b', 'c']\u{1b}[0m\n\ - " - ] + "] ); } @@ -1979,7 +1879,7 @@ mod colored { assert_eq!( failures, &[ - "assertion failed: expected subject to not contain any of ['r', 'b', 'c']\n \ + "expected subject to not contain any of ['r', 'b', 'c']\n \ but was: \"p\u{1b}[31mr\u{1b}[0moident tempo\u{1b}[31mr\u{1b}[0m est sed\"\n \ expected: not [\u{1b}[34m'r'\u{1b}[0m, 'b', 'c']\n\ " @@ -1999,7 +1899,7 @@ mod colored { assert_eq!( failures, &[ - "assertion failed: expected subject to not contain any of ['a', 's', 'e']\n \ + "expected subject to not contain any of ['a', 's', 'e']\n \ but was: \"proid\u{1b}[31me\u{1b}[0mnt t\u{1b}[31me\u{1b}[0mmpor \u{1b}[31mes\u{1b}[0mt \u{1b}[31mse\u{1b}[0md\"\n \ expected: not ['a', \u{1b}[34m's'\u{1b}[0m, \u{1b}[34m'e'\u{1b}[0m]\n\ " @@ -2019,7 +1919,7 @@ mod colored { assert_eq!( failures, &[ - "assertion failed: expected subject to not contain any of ['p', 'o', 'r']\n \ + "expected subject to not contain any of ['p', 'o', 'r']\n \ but was: \"\u{1b}[31mpro\u{1b}[0mident tem\u{1b}[31mpor\u{1b}[0m est sed\"\n \ expected: not [\u{1b}[34m'p'\u{1b}[0m, \u{1b}[34m'o'\u{1b}[0m, \u{1b}[34m'r'\u{1b}[0m]\n\ " @@ -2046,7 +1946,7 @@ mod colored_regex { assert_eq!( failures, &[ - "assertion failed: expected my_thing to match the regex \\b\\w{12}\\b\n \ + "expected my_thing to match the regex \\b\\w{12}\\b\n \ but was: \u{1b}[31mvolutpat lobortis aliquam diam\u{1b}[0m\n \ does not match regex: \u{1b}[32m\\b\\w{12}\\b\u{1b}[0m\n\ " @@ -2067,7 +1967,7 @@ mod colored_regex { assert_eq!( failures, &[ - "assertion failed: expected my_thing to not match the regex ^[a-zA-Z0-9 ]{8,32}$\n \ + "expected my_thing to not match the regex ^[a-zA-Z0-9 ]{8,32}$\n \ but was: \u{1b}[31mvolutpat lobortis aliquam diam\u{1b}[0m\n \ does match regex: \u{1b}[33m^[a-zA-Z0-9 ]{8,32}$\u{1b}[0m\n\ " diff --git a/src/vec/tests.rs b/src/vec/tests.rs index 385a826..5eda38b 100644 --- a/src/vec/tests.rs +++ b/src/vec/tests.rs @@ -30,12 +30,10 @@ fn verify_vec_is_equal_to_another_vec_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to be equal to [1, 3, 5, 7] + &[r"expected my_thing to be equal to [1, 3, 5, 7] but was: [2, 4, 6, 8] expected: [1, 3, 5, 7] -" - ] +"] ); } @@ -85,7 +83,7 @@ fn verify_vec_contains_fails() { assert_eq!( failures, - &[r"assertion failed: expected my_thing to contain 42 + &[r"expected my_thing to contain 42 but was: [1, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43] expected: 42 "] @@ -113,7 +111,7 @@ fn verify_vec_does_not_contain_fails() { assert_eq!( failures, - &[r"assertion failed: expected my_thing to not contain 19 + &[r"expected my_thing to not contain 19 but was: [1, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43] expected: not 19 "] @@ -141,7 +139,7 @@ fn verify_vec_contains_exactly_in_any_order_fails() { assert_eq!( failures, &[ - r"assertion failed: expected my_thing to contain exactly in any order [0, 1, 3, 5, 7, 11, 11, 13, 17, 19, 23, 29, 31, 37, 41] + r"expected my_thing to contain exactly in any order [0, 1, 3, 5, 7, 11, 11, 13, 17, 19, 23, 29, 31, 37, 41] but was: [5, 7, 11, 13, 1, 11, 3, 17, 23, 23, 29, 31, 41, 37, 43] expected: [0, 1, 3, 5, 7, 11, 11, 13, 17, 19, 23, 29, 31, 37, 41] missing: [0, 19] @@ -170,7 +168,7 @@ fn verify_vec_contains_any_of_fails() { assert_eq!( failures, &[ - r"assertion failed: expected my_thing to contain any of [0, 2, 4, 8, 16, 32, 64] + r"expected my_thing to contain any of [0, 2, 4, 8, 16, 32, 64] but was: [5, 7, 11, 13, 1, 11, 3, 17, 23, 23, 29, 31, 41, 37, 43] expected: [0, 2, 4, 8, 16, 32, 64] " @@ -197,7 +195,7 @@ fn verify_vec_does_not_contain_any_of_fails() { assert_eq!( failures, &[ - r"assertion failed: expected my_thing to not contain any of [2, 20, 4, 40, 8, 80] + r"expected my_thing to not contain any of [2, 20, 4, 40, 8, 80] but was: [5, 7, 20, 1, 17, 23, 23, 40, 20, 20, 41, 37, 43] expected: not [2, 20, 4, 40, 8, 80] " @@ -224,7 +222,7 @@ fn verify_vec_contains_all_of_fails() { assert_eq!( failures, &[ - r"assertion failed: expected my_thing to contain all of [5, 18, 3, 17, 45, 1, 1, 29, 0] + r"expected my_thing to contain all of [5, 18, 3, 17, 45, 1, 1, 29, 0] but was: [5, 7, 11, 13, 1, 11, 3, 17, 23, 23, 29, 31, 41, 37, 43] expected: [5, 18, 3, 17, 45, 1, 1, 29, 0] missing: [18, 45, 0] @@ -251,13 +249,11 @@ fn verify_vec_contains_only_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to contain only [1, 3, 7, 11, 19] + &[r"expected my_thing to contain only [1, 3, 7, 11, 19] but was: [5, 11, 1, 3, 19, 17, 11, 43] expected: [1, 3, 7, 11, 19] extra: [5, 17, 43] -" - ] +"] ); } @@ -279,14 +275,12 @@ fn verify_vec_contains_only_once_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to contain only once [1, 3, 7, 11, 19] + &[r"expected my_thing to contain only once [1, 3, 7, 11, 19] but was: [5, 11, 1, 3, 19, 17, 11, 43] expected: [1, 3, 7, 11, 19] extra: [5, 17, 43] duplicates: [11, 11] -" - ] +"] ); } @@ -337,7 +331,7 @@ fn verify_vec_contains_exactly_fails_out_of_order() { assert_eq!( failures, &[ - r#"assertion failed: expected my_thing to contain exactly in order ["two", "two", "one", "three", "four", "five", "six", "seven", "four", "eight", "nine"] + r#"expected my_thing to contain exactly in order ["two", "two", "one", "three", "four", "five", "six", "seven", "four", "eight", "nine"] but was: ["one", "two", "two", "three", "four", "five", "six", "four", "seven", "eight", "nine"] expected: ["two", "two", "one", "three", "four", "five", "six", "seven", "four", "eight", "nine"] missing: [] @@ -377,7 +371,7 @@ fn verify_vec_contains_exactly_fails_missing_and_extra() { assert_eq!( failures, &[ - r#"assertion failed: expected my_thing to contain exactly in order ["one", "two", "two", "three", "four", "five", "six", "six", "seven", "four", "eight", "nine"] + r#"expected my_thing to contain exactly in order ["one", "two", "two", "three", "four", "five", "six", "six", "seven", "four", "eight", "nine"] but was: ["one", "two", "six", "three", "four", "five", "six", "six", "seven", "eleven", "eight", "nine", "ten"] expected: ["one", "two", "two", "three", "four", "five", "six", "six", "seven", "four", "eight", "nine"] missing: ["two", "four"] @@ -415,7 +409,7 @@ fn verify_vec_contains_exactly_fails_expected_longer_than_vec() { assert_eq!( failures, &[ - r#"assertion failed: expected my_thing to contain exactly in order ["one", "two", "two", "three", "four", "five", "six", "four", "seven", "eight", "nine", "ten"] + r#"expected my_thing to contain exactly in order ["one", "two", "two", "three", "four", "five", "six", "four", "seven", "eight", "nine", "ten"] but was: ["one", "two", "two", "three", "four", "five", "six", "four", "seven", "eight", "nine"] expected: ["one", "two", "two", "three", "four", "five", "six", "four", "seven", "eight", "nine", "ten"] missing: ["ten"] @@ -478,7 +472,7 @@ fn verify_vec_contains_sequence_fails() { assert_eq!( failures, &[ - r#"assertion failed: expected my_thing to contain the sequence ["two", "three", "four", "five", "six", "six", "four"] + r#"expected my_thing to contain the sequence ["two", "three", "four", "five", "six", "six", "four"] but was: ["one", "two", "two", "three", "four", "five", "six", "four", "two", "seven", "two", "three", "five", "four", "six", "four", "eight", "nine", "ten"] expected: ["two", "three", "four", "five", "six", "six", "four"] missing: ["six", "four"] @@ -507,7 +501,7 @@ fn verify_vec_contains_sequence_fails_expected_longer_than_vec() { assert_eq!( failures, &[ - r#"assertion failed: expected my_thing to contain the sequence ["one", "two", "three", "four", "five", "six", "seven"] + r#"expected my_thing to contain the sequence ["one", "two", "three", "four", "five", "six", "seven"] but was: ["one", "two", "three", "four", "five", "six"] expected: ["one", "two", "three", "four", "five", "six", "seven"] missing: ["seven"] @@ -572,7 +566,7 @@ fn verify_vec_contains_all_in_order_fails() { assert_eq!( failures, &[ - r#"assertion failed: expected my_thing to contain all of ["one", "two", "two", "seven", "two", "three", "six", "six", "ten"] in order + r#"expected my_thing to contain all of ["one", "two", "two", "seven", "two", "three", "six", "six", "ten"] in order but was: ["one", "two", "two", "three", "four", "five", "six", "four", "two", "seven", "two", "three", "five", "four", "six", "four", "eight", "nine", "ten"] expected: ["one", "two", "two", "seven", "two", "three", "six", "six", "ten"] missing: ["six"] @@ -620,14 +614,12 @@ fn verify_vec_starts_with_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to start with [13, 5, 7, 1, 19] + &[r"expected my_thing to start with [13, 5, 7, 1, 19] but was: [13, 5, 7, 19, 1, 3, 11, 29, 23, 31, 37] expected: [13, 5, 7, 1, 19] missing: [1, 19] extra: [19, 1] -" - ] +"] ); } @@ -643,7 +635,7 @@ fn verify_empty_vec_starts_with_expected_sequence_longer_than_vec_fails() { assert_eq!( failures, &[ - r"assertion failed: expected my_thing to start with [13, 5, 7, 19, 1, 3, 11, 29, 23, 31, 37] + r"expected my_thing to start with [13, 5, 7, 19, 1, 3, 11, 29, 23, 31, 37] but was: [13, 5, 7, 19, 1, 3, 11, 29, 23, 31] expected: [13, 5, 7, 19, 1, 3, 11, 29, 23, 31, 37] missing: [37] @@ -692,14 +684,12 @@ fn verify_vec_ends_with_fails() { assert_eq!( failures, - &[ - r"assertion failed: expected my_thing to end with [11, 23, 23, 31, 73] + &[r"expected my_thing to end with [11, 23, 23, 31, 73] but was: [13, 5, 7, 19, 1, 3, 11, 29, 23, 31, 37] expected: [11, 23, 23, 31, 73] missing: [23, 73] extra: [29, 37] -" - ] +"] ); } @@ -715,7 +705,7 @@ fn verify_empty_vec_ends_with_expected_sequence_longer_than_vec_fails() { assert_eq!( failures, &[ - r"assertion failed: expected my_thing to end with [41, 13, 5, 7, 19, 1, 3, 11, 29, 23, 31] + r"expected my_thing to end with [41, 13, 5, 7, 19, 1, 3, 11, 29, 23, 31] but was: [13, 5, 7, 19, 1, 3, 11, 29, 23, 31] expected: [41, 13, 5, 7, 19, 1, 3, 11, 29, 23, 31] missing: [41] @@ -740,7 +730,7 @@ mod colored { .display_failures(); assert_eq!(failures, &[ - "assertion failed: expected subject to be equal to [1, 3, 5, 7, 11, 13, 19, 23, 29, 31, 37]\n \ + "expected subject to be equal to [1, 3, 5, 7, 11, 13, 19, 23, 29, 31, 37]\n \ but was: [\u{1b}[31m13\u{1b}[0m, 5, 7, \u{1b}[31m19\u{1b}[0m, \u{1b}[31m1\u{1b}[0m, \u{1b}[31m3\u{1b}[0m, 11, \u{1b}[31m29\u{1b}[0m, 23, 31, 37] expected: [\u{1b}[34m1\u{1b}[0m, \u{1b}[34m3\u{1b}[0m, 5, 7, 11, \u{1b}[34m13\u{1b}[0m, \u{1b}[34m19\u{1b}[0m, 23, \u{1b}[34m29\u{1b}[0m, 31, 37] "