Little bit of cleanup.

2 files changed, 20 insertions, 12 deletions

diff --git a/tests/test_deserialize.rs b/tests/test_deserialize.rs
index 0d689d9..776d562 100644
--- a/tests/test_deserialize.rs
+++ b/tests/test_deserialize.rs
@@ -46,9 +46,17 @@ fn deserialize_struct() {
         c2: 7
       }
     };
-    let input = urlencode("b[b1]=10&b[b2]=Ten&c[c1]=Seven&c[c2]=7");
+    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();
+    assert_eq!(result, params);
     let result: A = serde_urlencoded::from_str(&input).unwrap();
     assert_eq!(result, params);
+    let result: A = serde_urlencoded::from_str(&urlencode(input2)).unwrap();
+    assert_eq!(result, params);
+    let result: A = serde_urlencoded::from_str(&input2).unwrap();
+    assert_eq!(result, params);
+
 }
 
 fn urlencode(input: &str) -> String {
diff --git a/tests/test_serialize.rs b/tests/test_serialize.rs
index 91c4d1a..75dfc61 100644
--- a/tests/test_serialize.rs
+++ b/tests/test_serialize.rs
@@ -36,27 +36,27 @@ fn serialize_map_bool() {
 }
 
 #[derive(Serialize, Deserialize)]
-struct A { b: B, c: C }
+struct Foo { bar: Bar, baz: Baz }
 #[derive(Serialize, Deserialize)]
-struct B { b1: u8, b2: String }
+struct Bar { x: u8, y: String }
 #[derive(Serialize, Deserialize)]
-struct C { c1: String, c2: u8 }
+struct Baz { thing: String, other: u8 }
 
 #[test]
 fn serialize_struct() {
-    let params = A {
-      b: B {
-        b1: 10,
-        b2: "Ten".to_owned()
+    let params = Foo {
+      bar: Bar {
+        x: 10,
+        y: "Ten".to_owned()
       },
-      c: C {
-        c1: "Seven".to_owned(),
-        c2: 7
+      baz: Baz {
+        thing: "Thing".to_owned(),
+        other: 12
       }
     };
 
     assert_eq!(serde_urlencoded::to_string(&params),
-      Ok(urlencode("b[b1]=10&b[b2]=Ten&c[c1]=Seven&c[c2]=7")));
+      Ok(urlencode("bar[x]=10&bar[y]=Ten&baz[thing]=Thing&baz[other]=12")));
 }
 
 fn urlencode(input: &str) -> String {