1 files changed, 37 insertions, 39 deletions
diff --git a/src/tests/base_types.rs b/src/tests/base_types.rs
index 45f1fd3..4cc56ae 100644
--- a/src/tests/base_types.rs
+++ b/src/tests/base_types.rs
@@ -1,6 +1,5 @@
-use crate::protocol::primitive::serialize::{Serialize, SerializeUTF8};
 use crate::protocol::primitive::deserialize::{Deserialize, DeserializeUTF8};
-use crate::protocol::primitive::qread::QRead;
+use crate::protocol::primitive::serialize::{Serialize, SerializeUTF8};
 
 use crate::protocol::primitive::*;
 
@@ -8,34 +7,31 @@ use crate::protocol::primitive::*;
 pub fn serialize_string() {
     let test_string: String = String::from("Configured");
 
-    assert_eq!(test_string.serialize().unwrap(), [0, 0, 0, 20, 0, 67, 0, 111, 0, 110, 0, 102, 0, 105, 0, 103, 0, 117, 0, 114, 0, 101, 0, 100]);
+    assert_eq!(
+        test_string.serialize().unwrap(),
+        [
+            0, 0, 0, 20, 0, 67, 0, 111, 0, 110, 0, 102, 0, 105, 0, 103, 0, 117, 0, 114, 0, 101, 0,
+            100
+        ]
+    );
 }
 
 #[test]
 pub fn serialize_string_utf8() {
     let test_string: String = String::from("Configured");
 
-    assert_eq!(test_string.serialize_utf8().unwrap(), [0, 0, 0, 10, 67, 111, 110, 102, 105, 103, 117, 114, 101, 100]);
-}
-
-#[test]
-pub fn read_string() {
-    use std::io::Cursor;
-
-    let test_bytes: Vec<u8> = vec![0, 0, 0, 20, 0, 67, 0, 111, 0, 110, 0, 102, 0, 105, 0, 103, 0, 117, 0, 114, 0, 101, 0, 100, 0, 0, 0, 1];
-
-    let mut buf: Vec<u8> = [0; 24].to_vec();
-    let len = String::read(&mut Cursor::new(&test_bytes), &mut buf).unwrap();
-
-    assert_eq!(len, 24);
-
-    let result_bytes: Vec<u8> = vec![0, 0, 0, 20, 0, 67, 0, 111, 0, 110, 0, 102, 0, 105, 0, 103, 0, 117, 0, 114, 0, 101, 0, 100];
-    assert_eq!(buf, result_bytes);
+    assert_eq!(
+        test_string.serialize_utf8().unwrap(),
+        [0, 0, 0, 11, 67, 111, 110, 102, 105, 103, 117, 114, 101, 100, 0]
+    );
 }
 
 #[test]
 pub fn deserialize_string() {
-    let test_bytes: &[u8] = &[0, 0, 0, 20, 0, 67, 0, 111, 0, 110, 0, 102, 0, 105, 0, 103, 0, 117, 0, 114, 0, 101, 0, 100, 0, 0, 0, 1];
+    let test_bytes: &[u8] = &[
+        0, 0, 0, 20, 0, 67, 0, 111, 0, 110, 0, 102, 0, 105, 0, 103, 0, 117, 0, 114, 0, 101, 0, 100,
+        0, 0, 0, 1,
+    ];
     let (len, res) = String::parse(test_bytes).unwrap();
     assert_eq!(res, "Configured");
     assert_eq!(len, 24);
@@ -43,43 +39,45 @@ pub fn deserialize_string() {
 
 #[test]
 pub fn deserialize_string_utf8() {
-    let test_bytes: &[u8] = &[0, 0, 0, 10, 67, 111, 110, 102, 105, 103, 117, 114, 101, 100, 0, 0, 0, 1];
+    let test_bytes: &[u8] = &[
+        0, 0, 0, 10, 67, 111, 110, 102, 105, 103, 117, 114, 101, 100, 0, 0, 0, 1,
+    ];
     let (len, res) = String::parse_utf8(test_bytes).unwrap();
     assert_eq!(len, 14);
     assert_eq!(res, "Configured");
 }
 
 #[test]
+pub fn deserialize_string_utf8_null_terminated() {
+    let test_bytes: &[u8] = &[
+        0, 0, 0, 11, 67, 111, 110, 102, 105, 103, 117, 114, 101, 100, 0, 0, 0, 0, 1,
+    ];
+    let (len, res) = String::parse_utf8(test_bytes).unwrap();
+    assert_eq!(len, 15);
+    assert_eq!(res, "Configured");
+}
+
+#[test]
 pub fn serialize_string_list() {
     let mut test_list = StringList::new();
     test_list.push("Configured".to_string());
     assert_eq!(
         test_list.serialize().unwrap(),
-        [0, 0, 0, 1, 0, 0, 0, 20, 0, 67, 0, 111, 0, 110, 0, 102, 0, 105, 0, 103, 0, 117, 0, 114, 0, 101, 0, 100]
+        [
+            0, 0, 0, 1, 0, 0, 0, 20, 0, 67, 0, 111, 0, 110, 0, 102, 0, 105, 0, 103, 0, 117, 0, 114,
+            0, 101, 0, 100
+        ]
     )
 }
 
 #[test]
-pub fn read_string_list() {
-    use std::io::Cursor;
-
-    let test_bytes: Vec<u8> = vec![0, 0, 0, 1, 0, 0, 0, 20, 0, 67, 0, 111, 0, 110, 0, 102, 0, 105, 0, 103, 0, 117, 0, 114, 0, 101, 0, 100, 0, 0, 0, 1];
-
-    let mut buf: Vec<u8> = [0; 28].to_vec();
-    let len = StringList::read(&mut Cursor::new(&test_bytes), &mut buf).unwrap();
-
-    assert_eq!(len, 28);
-
-    let result_bytes: Vec<u8> = vec![0, 0, 0, 1, 0, 0, 0, 20, 0, 67, 0, 111, 0, 110, 0, 102, 0, 105, 0, 103, 0, 117, 0, 114, 0, 101, 0, 100];
-    assert_eq!(buf, result_bytes);
-}
-
-#[test]
 pub fn deserialize_string_list() {
-    let test_bytes: &[u8] = &[0, 0, 0, 1, 0, 0, 0, 20, 0, 67, 0, 111, 0, 110, 0, 102, 0, 105, 0, 103, 0, 117, 0, 114, 0, 101, 0, 100, 0, 0, 0, 1];
+    let test_bytes: &[u8] = &[
+        0, 0, 0, 1, 0, 0, 0, 20, 0, 67, 0, 111, 0, 110, 0, 102, 0, 105, 0, 103, 0, 117, 0, 114, 0,
+        101, 0, 100, 0, 0, 0, 1,
+    ];
     let mut test_list = StringList::new();
     test_list.push("Configured".to_string());
-    println!("aaaaa");
     let (len, res) = StringList::parse(test_bytes).unwrap();
     assert_eq!(len, 28);
     assert_eq!(test_list, res);