From 2397d494b586ef984726271ae0c227487d65c012 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Sat, 15 May 2021 19:29:41 +0200 Subject: [PATCH] serde: Fix url_deserialize test --- crates/ruma-serde/tests/url_deserialize.rs | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/crates/ruma-serde/tests/url_deserialize.rs b/crates/ruma-serde/tests/url_deserialize.rs index f106982a..0ed335d3 100644 --- a/crates/ruma-serde/tests/url_deserialize.rs +++ b/crates/ruma-serde/tests/url_deserialize.rs @@ -124,36 +124,26 @@ fn deserialize_multiple_lists() { #[test] fn deserialize_with_serde_attributes() { - use std::time::{Duration, SystemTime, UNIX_EPOCH}; - #[derive(Debug, PartialEq, Deserialize)] struct FieldsWithAttributes { #[serde(default)] xs: Vec, #[serde(default)] def: Option, - #[serde( - default, - deserialize_with = "ruma_serde::time::opt_ms_since_unix_epoch::deserialize" - )] - time: Option, + #[serde(default, deserialize_with = "ruma_serde::empty_string_as_none")] + str: Option, #[serde(default)] flag: bool, } assert_eq!( - urlencoded::from_str("xs=true&xs=false&def=3&time=1&flag=true"), - Ok(FieldsWithAttributes { - xs: vec![true, false], - def: Some(3), - time: Some(UNIX_EPOCH + Duration::from_millis(1)), - flag: true, - }) + urlencoded::from_str("xs=true&xs=false&def=3&str=&flag=true"), + Ok(FieldsWithAttributes { xs: vec![true, false], def: Some(3), str: None, flag: true }) ); assert_eq!( urlencoded::from_str(""), - Ok(FieldsWithAttributes { xs: vec![], def: None, time: None, flag: false }) + Ok(FieldsWithAttributes { xs: vec![], def: None, str: None, flag: false }) ); }