diff options
author | Alex Crichton <alex@alexcrichton.com> | 2019-07-29 09:06:35 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-29 09:06:35 -0500 |
commit | 5c6c3750727515fa4fc5bc3bc653293f5293f2c6 (patch) | |
tree | a043f6de866915df978bf7c166b7261b3c5d6335 /test-suite/tests/serde.rs | |
parent | 844a1a4651d6b77a5b48159348d9cccbd8f4c88f (diff) | |
parent | 3d08775266eb1979956b03add38e6bd4824f521a (diff) | |
download | milf-rs-5c6c3750727515fa4fc5bc3bc653293f5293f2c6.tar.gz milf-rs-5c6c3750727515fa4fc5bc3bc653293f5293f2c6.zip |
Merge pull request #313 from zertosh/show-col-in-errors
Show "column" in Error messages
Diffstat (limited to 'test-suite/tests/serde.rs')
-rw-r--r-- | test-suite/tests/serde.rs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/test-suite/tests/serde.rs b/test-suite/tests/serde.rs index bf019d4..95b8bc4 100644 --- a/test-suite/tests/serde.rs +++ b/test-suite/tests/serde.rs @@ -44,21 +44,17 @@ macro_rules! equivalent { } macro_rules! error { - ($ty:ty, $toml:expr, $error:expr) => {{ + ($ty:ty, $toml:expr, $msg_parse:expr, $msg_decode:expr) => {{ println!("attempting parsing"); match toml::from_str::<$ty>(&$toml.to_string()) { Ok(_) => panic!("successful"), - Err(e) => { - assert!(e.to_string().contains($error), "bad error: {}", e); - } + Err(e) => assert_eq!(e.to_string(), $msg_parse), } println!("attempting toml decoding"); match $toml.try_into::<$ty>() { Ok(_) => panic!("successful"), - Err(e) => { - assert!(e.to_string().contains($error), "bad error: {}", e); - } + Err(e) => assert_eq!(e.to_string(), $msg_decode), } }}; } @@ -277,6 +273,7 @@ fn type_errors() { Table(map! { bar: Value::String("a".to_string()) }), + "invalid type: string \"a\", expected isize for key `bar`", "invalid type: string \"a\", expected isize for key `bar`" } @@ -293,6 +290,7 @@ fn type_errors() { bar: Value::String("a".to_string()) }) }), + "invalid type: string \"a\", expected isize for key `foo.bar`", "invalid type: string \"a\", expected isize for key `foo.bar`" } } @@ -307,6 +305,7 @@ fn missing_errors() { error! { Foo, Table(map! { }), + "missing field `bar`", "missing field `bar`" } } |