Move some tests

2 files changed, 59 insertions, 61 deletions

diff --git a/serde_dhall/tests/de.rs b/serde_dhall/tests/de.rs
deleted file mode 100644
index f49bee4..0000000
--- a/serde_dhall/tests/de.rs
+++ /dev/null
@@ -1,61 +0,0 @@
-use serde::Deserialize;
-use serde_dhall::{from_str, FromDhall};
-
-#[test]
-fn test_de_untyped() {
-    use std::collections::BTreeMap;
-    use std::collections::HashMap;
-
-    fn parse<T: FromDhall>(s: &str) -> T {
-        from_str(s).parse().unwrap()
-    }
-
-    // Test tuples on record of wrong type
-    assert_eq!(
-        parse::<(u64, String, i64)>(r#"{ y = "foo", x = 1, z = +42 }"#),
-        (1, "foo".to_owned(), 42)
-    );
-
-    let mut expected_map = HashMap::new();
-    expected_map.insert("x".to_string(), 1);
-    expected_map.insert("y".to_string(), 2);
-    assert_eq!(
-        parse::<HashMap<String, u64>>("{ x = 1, y = 2 }"),
-        expected_map
-    );
-    assert_eq!(
-        parse::<HashMap<String, u64>>("toMap { x = 1, y = 2 }"),
-        expected_map
-    );
-
-    let mut expected_map = HashMap::new();
-    expected_map.insert("if".to_string(), 1);
-    expected_map.insert("FOO_BAR".to_string(), 2);
-    expected_map.insert("baz-kux".to_string(), 3);
-    assert_eq!(
-        parse::<HashMap<String, u64>>("{ `if` = 1, FOO_BAR = 2, baz-kux = 3 }"),
-        expected_map
-    );
-
-    let mut expected_map = BTreeMap::new();
-    expected_map.insert("x".to_string(), 1);
-    expected_map.insert("y".to_string(), 2);
-    assert_eq!(
-        parse::<BTreeMap<String, u64>>("{ x = 1, y = 2 }"),
-        expected_map
-    );
-
-    #[derive(Debug, PartialEq, Eq, Deserialize)]
-    struct Foo {
-        x: u64,
-        y: Option<u64>,
-    }
-    // Omit optional field
-    assert_eq!(parse::<Foo>("{ x = 1 }"), Foo { x: 1, y: None });
-
-    // https://github.com/Nadrieril/dhall-rust/issues/155
-    assert!(from_str("List/length [True, 42]").parse::<bool>().is_err());
-}
-
-// TODO: test various builder configurations
-// In particular test cloning and reusing builder
diff --git a/serde_dhall/tests/serde.rs b/serde_dhall/tests/serde.rs
index ce25380..03bcc58 100644
--- a/serde_dhall/tests/serde.rs
+++ b/serde_dhall/tests/serde.rs
@@ -146,4 +146,63 @@ mod serde {
             .parse::<Bar>()
             .is_err());
     }
+
+    #[test]
+    fn test_de_untyped() {
+        use std::collections::BTreeMap;
+        use std::collections::HashMap;
+
+        fn parse<T: FromDhall>(s: &str) -> T {
+            from_str(s).parse().unwrap()
+        }
+
+        // Test tuples on record of wrong type. Fields are just taken in alphabetic order.
+        assert_eq!(
+            parse::<(u64, String, i64)>(r#"{ y = "foo", x = 1, z = +42 }"#),
+            (1, "foo".to_owned(), 42)
+        );
+
+        let mut expected_map = HashMap::new();
+        expected_map.insert("x".to_string(), 1);
+        expected_map.insert("y".to_string(), 2);
+        assert_eq!(
+            parse::<HashMap<String, u64>>("{ x = 1, y = 2 }"),
+            expected_map
+        );
+        assert_eq!(
+            parse::<HashMap<String, u64>>("toMap { x = 1, y = 2 }"),
+            expected_map
+        );
+
+        let mut expected_map = HashMap::new();
+        expected_map.insert("if".to_string(), 1);
+        expected_map.insert("FOO_BAR".to_string(), 2);
+        expected_map.insert("baz-kux".to_string(), 3);
+        assert_eq!(
+            parse::<HashMap<String, u64>>("{ `if` = 1, FOO_BAR = 2, baz-kux = 3 }"),
+            expected_map
+        );
+
+        let mut expected_map = BTreeMap::new();
+        expected_map.insert("x".to_string(), 1);
+        expected_map.insert("y".to_string(), 2);
+        assert_eq!(
+            parse::<BTreeMap<String, u64>>("{ x = 1, y = 2 }"),
+            expected_map
+        );
+
+        #[derive(Debug, PartialEq, Eq, Deserialize)]
+        struct Foo {
+            x: u64,
+            y: Option<u64>,
+        }
+        // Omit optional field
+        assert_eq!(parse::<Foo>("{ x = 1 }"), Foo { x: 1, y: None });
+
+        // https://github.com/Nadrieril/dhall-rust/issues/155
+        assert!(from_str("List/length [True, 42]").parse::<bool>().is_err());
+    }
+
+    // TODO: test various builder configurations
+    // In particular test cloning and reusing builder
 }