diff --git a/rust/lib/yunq-test/src/lib.rs b/rust/lib/yunq-test/src/lib.rs index 9af3d55..1a3c3ec 100644 --- a/rust/lib/yunq-test/src/lib.rs +++ b/rust/lib/yunq-test/src/lib.rs @@ -12,11 +12,7 @@ mod tests { #[test] fn basic_serialization() -> Result<(), ZError> { - let basic = Basic { - unsigned_int: 82, - signed_int: -1234, - strn: "abc".to_string(), - }; + let basic = Basic { unsigned_int: 82, signed_int: -1234, strn: "abc".to_string() }; let mut buf = ByteBuffer::<1024>::new(); let mut caps = Vec::new(); @@ -31,17 +27,13 @@ mod tests { #[test] fn basic_serialization_as_request() -> Result<(), ZError> { - let basic = Basic { - unsigned_int: 82, - signed_int: -1234, - strn: "abc".to_string(), - }; + let basic = Basic { unsigned_int: 82, signed_int: -1234, strn: "abc".to_string() }; let mut buf = ByteBuffer::<1024>::new(); let mut caps = Vec::new(); let req_id = 12; basic.serialize_as_request(req_id, &mut buf, &mut caps)?; - + assert!(buf.at::(8)? == req_id); let parsed = Basic::parse_from_request(&buf, &caps)?; @@ -58,7 +50,7 @@ mod tests { let mut buf = ByteBuffer::<1024>::new(); let mut caps = Vec::new(); cap.serialize(&mut buf, 0, &mut caps)?; - + assert!(caps.len() == 1); assert!(caps[0] == cap_id); @@ -71,14 +63,12 @@ mod tests { #[test] fn repeated_serialization() -> Result<(), ZError> { - let rep = Repeated { - unsigned_ints: vec![0, 1, 3], - }; + let rep = Repeated { unsigned_ints: vec![0, 1, 3],}; let mut buf = ByteBuffer::<1024>::new(); let mut caps = Vec::new(); rep.serialize(&mut buf, 0, &mut caps)?; - + let parsed = Repeated::parse(&buf, 0, &caps)?; assert!(parsed == rep); @@ -89,21 +79,18 @@ mod tests { #[test] fn nested_serialization() -> Result<(), ZError> { let nested = Nested { - basic: Basic { - unsigned_int: 82, - signed_int: -1234, - strn: "abc".to_string(), - }, - cap1: Cap { cap: 37 }, - cap2: Cap { cap: 39 }, + basic: Basic { unsigned_int: 82, signed_int: -1234, strn: "abc".to_string() }, + cap1: Cap { cap: 37}, + cap2: Cap { cap: 39}, }; let mut buf = ByteBuffer::<1024>::new(); let mut caps = Vec::new(); nested.serialize(&mut buf, 0, &mut caps)?; - + let parsed = Nested::parse(&buf, 0, &caps)?; + assert!(parsed == nested); Ok(()) @@ -112,29 +99,23 @@ mod tests { #[test] fn repeated_nested_serialization() -> Result<(), ZError> { let nested = RepeatedNested { - basics: vec![ - Basic { - unsigned_int: 82, - signed_int: -1234, - strn: "abc".to_string(), - }, - Basic { - unsigned_int: 21, - signed_int: -8, - strn: "def".to_string(), - }, - ], - caps: vec![Cap { cap: 123 }, Cap { cap: 12343 }], + basics: vec![Basic { unsigned_int: 82, signed_int: -1234, strn: "abc".to_string(),}, + Basic { unsigned_int: 21, signed_int: -8, strn: "def".to_string(), },], + caps: vec![Cap{ cap: 123}, Cap {cap: 12343}], }; let mut buf = ByteBuffer::<1024>::new(); let mut caps = Vec::new(); nested.serialize(&mut buf, 0, &mut caps)?; - + let parsed = RepeatedNested::parse(&buf, 0, &caps)?; + assert!(parsed == nested); + Ok(()) } + + }