From e070270c3f1f10d46281ed7751ff95e15092e7f4 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Sun, 10 May 2020 22:09:43 +0100 Subject: Implement serialization --- serde_dhall/tests/de.rs | 59 +------------------------------------------------ 1 file changed, 1 insertion(+), 58 deletions(-) (limited to 'serde_dhall/tests/de.rs') diff --git a/serde_dhall/tests/de.rs b/serde_dhall/tests/de.rs index 3abaad2..0b43de2 100644 --- a/serde_dhall/tests/de.rs +++ b/serde_dhall/tests/de.rs @@ -1,62 +1,5 @@ use serde::Deserialize; -use serde_dhall::{from_str, FromDhall, NumKind, SimpleValue, StaticType}; - -#[test] -fn test_de_typed() { - fn parse(s: &str) -> T { - from_str(s).static_type_annotation().parse().unwrap() - } - - assert_eq!(parse::("True"), true); - - assert_eq!(parse::("1"), 1); - assert_eq!(parse::("1"), 1); - assert_eq!(parse::("1"), 1); - - assert_eq!(parse::("+1"), 1); - assert_eq!(parse::("+1"), 1); - assert_eq!(parse::("+1"), 1); - - assert_eq!(parse::("1.0"), 1.0); - assert_eq!(parse::("1.0"), 1.0); - - assert_eq!(parse::(r#""foo""#), "foo".to_owned()); - assert_eq!(parse::>("[] : List Natural"), >::new()); - assert_eq!(parse::>("[1, 2]"), vec![1, 2]); - assert_eq!(parse::>("None Natural"), None); - assert_eq!(parse::>("Some 1"), Some(1)); - - assert_eq!( - parse::<(u64, String)>(r#"{ _1 = 1, _2 = "foo" }"#), - (1, "foo".to_owned()) - ); - - #[derive(Debug, PartialEq, Eq, Deserialize, StaticType)] - struct Foo { - x: u64, - y: i64, - } - assert_eq!(parse::("{ x = 1, y = -2 }"), Foo { x: 1, y: -2 }); - - #[derive(Debug, PartialEq, Eq, Deserialize, StaticType)] - enum Bar { - X(u64), - Y(i64), - } - assert_eq!(parse::("< X: Natural | Y: Integer >.X 1"), Bar::X(1)); - - #[derive(Debug, PartialEq, Eq, Deserialize, StaticType)] - enum Baz { - X, - Y(i64), - } - assert_eq!(parse::("< X | Y: Integer >.X"), Baz::X); - - assert!(from_str("< X | Y: Integer >.Y") - .static_type_annotation() - .parse::() - .is_err()); -} +use serde_dhall::{from_str, FromDhall, NumKind, SimpleValue}; #[test] fn test_de_untyped() { -- cgit v1.2.3 From 3b728aff86a086f71f013b77a715c33748d9f6a8 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Wed, 28 Oct 2020 21:45:42 +0000 Subject: Make type annotation optional to allow serializing SimpleValue --- serde_dhall/tests/de.rs | 34 +--------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) (limited to 'serde_dhall/tests/de.rs') diff --git a/serde_dhall/tests/de.rs b/serde_dhall/tests/de.rs index 0b43de2..f49bee4 100644 --- a/serde_dhall/tests/de.rs +++ b/serde_dhall/tests/de.rs @@ -1,5 +1,5 @@ use serde::Deserialize; -use serde_dhall::{from_str, FromDhall, NumKind, SimpleValue}; +use serde_dhall::{from_str, FromDhall}; #[test] fn test_de_untyped() { @@ -57,37 +57,5 @@ fn test_de_untyped() { assert!(from_str("List/length [True, 42]").parse::().is_err()); } -#[test] -fn test_de_simplevalue() { - let bool_true = SimpleValue::Num(NumKind::Bool(true)); - // https://github.com/Nadrieril/dhall-rust/issues/184 - assert_eq!( - from_str("[ True ]").parse::>().unwrap(), - vec![bool_true.clone()] - ); - - assert_eq!( - from_str("< Foo >.Foo").parse::().unwrap(), - SimpleValue::Union("Foo".into(), None) - ); - assert_eq!( - from_str("< Foo: Bool >.Foo True") - .parse::() - .unwrap(), - SimpleValue::Union("Foo".into(), Some(Box::new(bool_true.clone()))) - ); - - #[derive(Debug, PartialEq, Eq, Deserialize)] - struct Foo { - foo: SimpleValue, - } - assert_eq!( - from_str("{ foo = True }").parse::().unwrap(), - Foo { - foo: bool_true.clone() - }, - ); -} - // TODO: test various builder configurations // In particular test cloning and reusing builder -- cgit v1.2.3 From 1a53f10c6ed1ef65621b39c40e05da79161047cc Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Wed, 28 Oct 2020 23:26:22 +0000 Subject: Move some tests --- serde_dhall/tests/de.rs | 61 ------------------------------------------------- 1 file changed, 61 deletions(-) delete mode 100644 serde_dhall/tests/de.rs (limited to 'serde_dhall/tests/de.rs') 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(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::>("{ x = 1, y = 2 }"), - expected_map - ); - assert_eq!( - parse::>("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::>("{ `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::>("{ x = 1, y = 2 }"), - expected_map - ); - - #[derive(Debug, PartialEq, Eq, Deserialize)] - struct Foo { - x: u64, - y: Option, - } - // Omit optional field - assert_eq!(parse::("{ x = 1 }"), Foo { x: 1, y: None }); - - // https://github.com/Nadrieril/dhall-rust/issues/155 - assert!(from_str("List/length [True, 42]").parse::().is_err()); -} - -// TODO: test various builder configurations -// In particular test cloning and reusing builder -- cgit v1.2.3