removed AmqpType from tests to simplify them

Author: simplist-coder

amqp-type/src/amqp_type.rs

@@ -75,6 +75,12 @@ impl Encode for AmqpType {
     }
 }
 
+impl From<bool> for AmqpType {
+    fn from(value: bool) -> Self {
+        AmqpType::Boolean(value)
+    }
+}
+
 impl From<Timestamp> for AmqpType {
     fn from(value: Timestamp) -> Self {
         AmqpType::Timestamp(value)

amqp-type/src/compound/list.rs

@@ -32,13 +32,13 @@ mod test {
     use super::*;
     #[test]
     fn construct_empty_list() {
-        let val = AmqpType::List(vec![].into());
+        let val = List(vec![]);
         assert_eq!(val.encode().constructor(), 0x45);
     }
 
     #[test]
     fn construct_list_with_less_than_255_elements() {
-        let val = AmqpType::List(vec![1.into()].into());
+        let val = List(vec![1.into()]);
         assert_eq!(val.encode().constructor(), 0xc0);
     }
 
@@ -48,7 +48,7 @@ mod test {
         for i in 0..500 {
             arr.push(i.into())
         }
-        let val = AmqpType::List(arr.into());
+        let val = List(arr);
         assert_eq!(val.encode().constructor(), 0xd0);
     }
 
@@ -58,7 +58,7 @@ mod test {
         for _ in 0..100 {
             arr.push("aaaaaaaaaaaaaaaaaaaa".into());
         }
-        let val = AmqpType::List(arr.into());
+        let val = List(arr);
         assert_eq!(val.encode().constructor(), 0xd0);
     }
 }

amqp-type/src/compound/map.rs

@@ -46,7 +46,7 @@ mod test {
     use super::*;
     #[test]
     fn construct_map_with_less_than_255_elements() {
-        let val = AmqpType::Map(IndexMap::new().into());
+        let val = Map(IndexMap::new());
         assert_eq!(val.encode().constructor(), 0xc1);
     }
 
@@ -56,7 +56,7 @@ mod test {
         for i in 1..500 {
             map.insert(i.into(), i.into());
         }
-        let val = AmqpType::Map(map.into());
+        let val = Map(map);
         assert_eq!(val.encode().constructor(), 0xd1);
     }
 }

amqp-type/src/fixed_width/boolean.rs

@@ -1,12 +1,5 @@
-use crate::amqp_type::AmqpType;
 use crate::serde::encode::{Encode, Encoded};
 
-impl From<bool> for AmqpType {
-    fn from(value: bool) -> Self {
-        AmqpType::Boolean(value)
-    }
-}
-
 impl Encode for bool {
     #[cfg(feature = "zero-length-bools")]
     fn encode(&self) -> Encoded {
@@ -28,25 +21,24 @@ impl Encode for bool {
 #[cfg(test)]
 mod test {
     use crate::serde::encode::Encode;
+
     use super::*;
+
     #[test]
     #[cfg(not(feature = "zero-length-bools"))]
     fn construct_bool() {
-        let val = AmqpType::Boolean(true);
-        assert_eq!(val.encode().constructor(), 0x56);
+        assert_eq!(true.encode().constructor(), 0x56);
     }
 
     #[test]
     #[cfg(feature = "zero-length-bools")]
     fn amqp_type_constructs_bool_false_as_zero_length() {
-        let val = AmqpType::Boolean(false);
-        assert_eq!(val.encode().constructor(), 0x42);
+        assert_eq!(false.encode().constructor(), 0x42);
     }
 
     #[test]
     #[cfg(feature = "zero-length-bools")]
     fn amqp_type_constructs_bool_true_as_zero_length() {
-        let val = AmqpType::Boolean(true);
-        assert_eq!(val.encode().constructor(), 0x41)
+        assert_eq!(true.encode().constructor(), 0x41)
     }
 }