From ab8e46b0660e076e629e6775ed8da9890c5fbf1f Mon Sep 17 00:00:00 2001 From: John Clements Date: Wed, 13 Mar 2013 12:10:32 -0700 Subject: [PATCH] add assert_eq! macro the assert_eq! macro compares its arguments and fails if they're not equal. It's more informative than fail_unless!, because it explicitly writes the given and expected arguments on failure. --- src/libsyntax/ext/expand.rs | 10 ++++++++++ src/test/run-fail/assert-eq-macro-fail.rs | 8 ++++++++ src/test/run-pass/assert-eq-macro-success.rs | 10 ++++++++++ 3 files changed, 28 insertions(+) create mode 100644 src/test/run-fail/assert-eq-macro-fail.rs create mode 100644 src/test/run-pass/assert-eq-macro-success.rs diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index ad05e2f21e6..030cdab7951 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -464,6 +464,15 @@ pub fn core_macros() -> ~str { } ) + macro_rules! assert_eq ( + ($given:expr , $expected:expr) => + ({let given_val = $given; + let expected_val = $expected; + // check both directions of equality.... + if !((given_val == expected_val) && (expected_val == given_val)) { + fail!(fmt!(\"expected: %?, given: %?\",expected_val,given_val)); + }})) + macro_rules! condition ( { $c:ident: $in:ty -> $out:ty; } => { @@ -481,6 +490,7 @@ pub fn core_macros() -> ~str { } ) + }"; } diff --git a/src/test/run-fail/assert-eq-macro-fail.rs b/src/test/run-fail/assert-eq-macro-fail.rs new file mode 100644 index 00000000000..a5f438903ce --- /dev/null +++ b/src/test/run-fail/assert-eq-macro-fail.rs @@ -0,0 +1,8 @@ +// error-pattern:expected: 15, given: 14 + +#[deriving_eq] +struct Point { x : int } + +fn main() { + assert_eq!(14,15); +} diff --git a/src/test/run-pass/assert-eq-macro-success.rs b/src/test/run-pass/assert-eq-macro-success.rs new file mode 100644 index 00000000000..c929b5c6246 --- /dev/null +++ b/src/test/run-pass/assert-eq-macro-success.rs @@ -0,0 +1,10 @@ +#[deriving_eq] +struct Point { x : int } + +fn main() { + assert_eq!(14,14); + assert_eq!(~"abc",~"abc"); + assert_eq!(~Point{x:34},~Point{x:34}); + assert_eq!(&Point{x:34},&Point{x:34}); + assert_eq!(@Point{x:34},@Point{x:34}); +}