Fixed 2 more bugs

aero-dav/src/decoder.rs

@@ -473,7 +473,7 @@ impl QRead<Owner> for Owner {
 
 impl QRead<Timeout> for Timeout {
     async fn qread(xml: &mut Reader<impl IRead>) -> Result<Self, ParsingError> {
-        const SEC_PFX: &str = "SEC_PFX";
+        const SEC_PFX: &str = "Second-";
         xml.open(DAV_URN, "timeout").await?;
         
         let timeout = match xml.tag_string().await?.as_str() {
@@ -492,7 +492,7 @@ impl QRead<Timeout> for Timeout {
 impl QRead<LockToken> for LockToken {
     async fn qread(xml: &mut Reader<impl IRead>) -> Result<Self, ParsingError> {
         xml.open(DAV_URN, "locktoken").await?;
-        let href = Href::qread(xml).await?;
+        let href = xml.find::<Href>().await?;
         xml.close().await?;
         Ok(LockToken(href))
     }
@@ -501,7 +501,7 @@ impl QRead<LockToken> for LockToken {
 impl QRead<LockRoot> for LockRoot {
     async fn qread(xml: &mut Reader<impl IRead>) -> Result<Self, ParsingError> {
         xml.open(DAV_URN, "lockroot").await?;
-        let href = Href::qread(xml).await?;
+        let href = xml.find::<Href>().await?;
         xml.close().await?;
         Ok(LockRoot(href))
     }

aero-dav/src/encoder.rs

@@ -996,16 +996,15 @@ mod tests {
 
     #[tokio::test]
     async fn rfc_propertyupdate() {
-        let got = serialize(
+        let orig = PropertyUpdate::<Core>(vec![
-            &PropertyUpdate::<Core>(vec![
             PropertyUpdateItem::Set(Set(PropValue(vec![
                 Property::GetContentLanguage("fr-FR".into()),
             ]))),
             PropertyUpdateItem::Remove(Remove(PropName(vec![
                 PropertyRequest::DisplayName,
             ]))),
-            ]),
+        ]);
-        ).await;
+        let got = serialize(&orig).await;
 
         let expected = r#"<D:propertyupdate xmlns:D="DAV:">
     <D:set>
@@ -1021,12 +1020,12 @@ mod tests {
 </D:propertyupdate>"#;
 
         assert_eq!(&got, expected, "\n---GOT---\n{got}\n---EXP---\n{expected}\n");
+        assert_eq!(deserialize::<PropertyUpdate::<Core>>(got.as_str()).await, orig)
     }
 
     #[tokio::test]
     async fn rfc_delete_locked2() {
-        let got = serialize(
+        let orig = Multistatus::<Core, PropValue<Core>> {
-            &Multistatus::<Core, PropValue<Core>> {
             responses: vec![Response {
                 status_or_propstat: StatusOrPropstat::Status(
                     vec![Href("http://www.example.com/container/resource3".into())],
@@ -1037,8 +1036,9 @@ mod tests {
                 location: None,
             }],
             responsedescription: None,
-            },
+        };
-        ).await;
+
+        let got = serialize(&orig).await;
 
         let expected = r#"<D:multistatus xmlns:D="DAV:">
     <D:response>
@@ -1051,17 +1051,18 @@ mod tests {
 </D:multistatus>"#;
 
         assert_eq!(&got, expected, "\n---GOT---\n{got}\n---EXP---\n{expected}\n");
+        assert_eq!(deserialize::<Multistatus::<Core, PropValue<Core>>>(got.as_str()).await, orig)
     }
 
     #[tokio::test]
     async fn rfc_simple_lock_request() {
-        let got = serialize(
+        let orig = LockInfo {
-            &LockInfo {
             lockscope: LockScope::Exclusive,
             locktype: LockType::Write,
             owner: Some(Owner::Href(Href("http://example.org/~ejw/contact.html".into()))),
-            },
+        };
-        ).await;
+
+        let got = serialize(&orig).await;
 
         let expected = r#"<D:lockinfo xmlns:D="DAV:">
     <D:lockscope>
@@ -1076,12 +1077,12 @@ mod tests {
 </D:lockinfo>"#;
 
         assert_eq!(&got, expected, "\n---GOT---\n{got}\n---EXP---\n{expected}\n");
+        assert_eq!(deserialize::<LockInfo>(got.as_str()).await, orig)
     }
 
     #[tokio::test]
     async fn rfc_simple_lock_response() {
-        let got = serialize(
+        let orig = PropValue::<Core>(vec![
-            &PropValue::<Core>(vec![
             Property::LockDiscovery(vec![ActiveLock {
                 lockscope: LockScope::Exclusive,
                 locktype: LockType::Write,
@@ -1091,8 +1092,9 @@ mod tests {
                 locktoken: Some(LockToken(Href("urn:uuid:e71d4fae-5dec-22d6-fea5-00a0c91e6be4".into()))),
                 lockroot: LockRoot(Href("http://example.com/workspace/webdav/proposal.doc".into())),
             }]),
-            ]),
+        ]);
-        ).await;
+
+        let got = serialize(&orig).await;
 
         let expected = r#"<D:prop xmlns:D="DAV:">
     <D:lockdiscovery>
@@ -1119,5 +1121,6 @@ mod tests {
 </D:prop>"#;
 
         assert_eq!(&got, expected, "\n---GOT---\n{got}\n---EXP---\n{expected}\n");
+        assert_eq!(deserialize::<PropValue::<Core>>(got.as_str()).await, orig)
     }
 }