From 92ba37c0679cb79b6ef686866e5b4c0cc7575878 Mon Sep 17 00:00:00 2001
From: Sam Scott <sam.scott89@gmail.com>
Date: Wed, 8 Mar 2017 18:14:48 -0500
Subject: Refactoring aproach.

---
 tests/test_deserialize.rs | 40 +++++-----------------------------------
 tests/test_serialize.rs   | 37 ++-----------------------------------
 2 files changed, 7 insertions(+), 70 deletions(-)

(limited to 'tests')

diff --git a/tests/test_deserialize.rs b/tests/test_deserialize.rs
index b6a65a5..2e2b8fd 100644
--- a/tests/test_deserialize.rs
+++ b/tests/test_deserialize.rs
@@ -1,36 +1,6 @@
 #[macro_use]
 extern crate serde_derive;
-extern crate serde_urlencoded;
-
-#[test]
-fn deserialize_bytes() {
-    let mut result = vec![("first".to_owned(), 23), ("last".to_owned(), 42)];
-    let mut deres: Vec<(String, u8)> = serde_urlencoded::from_bytes(b"first=23&last=42").unwrap();
-
-    result.sort();
-    deres.sort();
-    assert_eq!(deres, result);
-}
-
-#[test]
-fn deserialize_str() {
-    let mut result = vec![("first".to_owned(), 23), ("last".to_owned(), 42)];
-    let mut deres: Vec<(String, u8)> = serde_urlencoded::from_str("first=23&last=42").unwrap();
-
-    result.sort();
-    deres.sort();
-    assert_eq!(deres, result);
-}
-
-#[test]
-fn deserialize_reader() {
-    let mut result = vec![("first".to_owned(), 23), ("last".to_owned(), 42)];
-    let mut deres: Vec<(String, u8)> = serde_urlencoded::from_reader(b"first=23&last=42" as &[_]).unwrap();
-
-    result.sort();
-    deres.sort();
-    assert_eq!(deres, result);
-}
+extern crate serde_qs as qs;
 
 
 #[derive(PartialEq, Debug, Serialize, Deserialize)]
@@ -54,13 +24,13 @@ fn deserialize_struct() {
     };
     let input = "b[b1]=10&b[b2]=Ten&c[c1]=Seven&c[c2]=7";
     let input2 = "c[c1]=Seven&b[b2]=Ten&b[b1]=10&c[c2]=7";
-    let result: A = serde_urlencoded::from_str(&urlencode(input)).unwrap();
+    let result: A = qs::from_str(&urlencode(input)).unwrap();
     assert_eq!(result, params);
-    let result: A = serde_urlencoded::from_str(&input).unwrap();
+    let result: A = qs::from_str(&input).unwrap();
     assert_eq!(result, params);
-    let result: A = serde_urlencoded::from_str(&urlencode(input2)).unwrap();
+    let result: A = qs::from_str(&urlencode(input2)).unwrap();
     assert_eq!(result, params);
-    let result: A = serde_urlencoded::from_str(&input2).unwrap();
+    let result: A = qs::from_str(&input2).unwrap();
     assert_eq!(result, params);
 
 }
diff --git a/tests/test_serialize.rs b/tests/test_serialize.rs
index 75dfc61..c10c3da 100644
--- a/tests/test_serialize.rs
+++ b/tests/test_serialize.rs
@@ -1,39 +1,6 @@
 #[macro_use]
 extern crate serde_derive;
-extern crate serde_urlencoded;
-
-#[test]
-fn serialize_option_map_int() {
-    let params = &[("first", Some(23)), ("middle", None), ("last", Some(42))];
-
-    assert_eq!(serde_urlencoded::to_string(params),
-               Ok("first=23&last=42".to_owned()));
-}
-
-#[test]
-fn serialize_option_map_string() {
-    let params =
-        &[("first", Some("hello")), ("middle", None), ("last", Some("world"))];
-
-    assert_eq!(serde_urlencoded::to_string(params),
-               Ok("first=hello&last=world".to_owned()));
-}
-
-#[test]
-fn serialize_option_map_bool() {
-    let params = &[("one", Some(true)), ("two", Some(false))];
-
-    assert_eq!(serde_urlencoded::to_string(params),
-               Ok("one=true&two=false".to_owned()));
-}
-
-#[test]
-fn serialize_map_bool() {
-    let params = &[("one", true), ("two", false)];
-
-    assert_eq!(serde_urlencoded::to_string(params),
-               Ok("one=true&two=false".to_owned()));
-}
+extern crate serde_qs as qs;
 
 #[derive(Serialize, Deserialize)]
 struct Foo { bar: Bar, baz: Baz }
@@ -55,7 +22,7 @@ fn serialize_struct() {
       }
     };
 
-    assert_eq!(serde_urlencoded::to_string(&params),
+    assert_eq!(qs::to_string(&params),
       Ok(urlencode("bar[x]=10&bar[y]=Ten&baz[thing]=Thing&baz[other]=12")));
 }
 
-- 
cgit v1.2.3