From 78e104706f03bf4a2475b6b9dda083bf06a95282 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 20 Jan 2016 10:42:40 +0100 Subject: [PATCH] Adapt tests --- libimagutil/src/key_value_split.rs | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/libimagutil/src/key_value_split.rs b/libimagutil/src/key_value_split.rs index 32fd30a9..567118bb 100644 --- a/libimagutil/src/key_value_split.rs +++ b/libimagutil/src/key_value_split.rs @@ -51,36 +51,34 @@ impl IntoKeyValue for String { #[cfg(test)] mod test { - use super::split_into_key_value; + use super::{KeyValue, IntoKeyValue}; #[test] fn test_single_quoted() { - let s = String::from("foo='bar'"); - assert_eq!(Some((String::from("foo"), String::from("bar"))), split_into_key_value(s)); + let s = String::from("foo='bar'").into_kv().unwrap(); + assert_eq!(KeyValue::new(String::from("foo"), String::from("bar")), s); } #[test] fn test_double_quoted() { - let s = String::from("foo=\"bar\""); - assert_eq!(Some((String::from("foo"), String::from("bar"))), split_into_key_value(s)); + let s = String::from("foo=\"bar\"").into_kv().unwrap(); + assert_eq!(KeyValue::new(String::from("foo"), String::from("bar")), s); } #[test] fn test_double_and_single_quoted() { - let s = String::from("foo=\"bar\'"); - assert!(split_into_key_value(s).is_none()); + assert!(String::from("foo=\"bar\'").into_kv().is_none()); } #[test] fn test_single_and_double_quoted() { - let s = String::from("foo=\'bar\""); - assert!(split_into_key_value(s).is_none()); + assert!(String::from("foo=\'bar\"").into_kv().is_none()); } #[test] fn test_not_quoted() { - let s = String::from("foo=bar"); - assert_eq!(Some((String::from("foo"), String::from("bar"))), split_into_key_value(s)); + let s = String::from("foo=bar").into_kv().unwrap(); + assert_eq!(KeyValue::new(String::from("foo"), String::from("bar")), s); } }