test(decompression-plz): DecodeState

Author: darkseid-is

build_rs_cov.profraw

@@ -5,7 +5,7 @@ use header_plz::body_headers::encoding_info::EncodingInfo;
 use header_plz::body_headers::transfer_types::TransferType;
 
 use crate::chunked::chunked_to_raw;
-use crate::content_length::add_body_and_update_cl;
+use crate::content_length::{add_body_and_update_cl, update_content_length};
 use crate::decompress_trait::DecompressTrait;
 
 #[cfg_attr(test, derive(PartialEq))]
@@ -20,7 +20,7 @@ pub struct DecodeStruct<'a, T> {
 
 impl<'a, T> DecodeStruct<'a, T>
 where
-    T: DecompressTrait,
+    T: DecompressTrait + std::fmt::Debug,
 {
     pub fn new(message: &'a mut T, buf: &'a mut BytesMut) -> Self {
         let body = message.get_body().into_bytes().unwrap();

decompression-plz/src/decode_struct.rs

@@ -17,7 +17,7 @@ pub fn decompress<T>(
     buf: &mut BytesMut,
 ) -> Result<(), MultiDecompressErrorReason>
 where
-    T: DecompressTrait,
+    T: DecompressTrait + std::fmt::Debug,
 {
     let mut state = DecodeState::init(message, buf);
     loop {

decompression-plz/src/lib.rs

@@ -110,7 +110,7 @@ where
                 decode_struct.add_body_and_update_cl();
                 Err(e)
             }
-            DecodeState::End => Ok(Self::End),
+            DecodeState::End => Ok(DecodeState::End),
         }
     }
 
@@ -221,11 +221,11 @@ mod tests {
         }
 
         fn header_map(&self) -> &HeaderMap {
-            self.header_map()
+            &self.header_map
         }
 
         fn header_map_as_mut(&mut self) -> &mut HeaderMap {
-            self.header_map_as_mut()
+            &mut self.header_map
         }
     }
 
@@ -244,18 +244,57 @@ mod tests {
                 extra_body: extra,
             }
         }
+
+        fn into_bytes(self) -> BytesMut {
+            let mut bytes = self.header_map.into_bytes();
+            bytes.unsplit(self.body.unwrap().into_bytes().unwrap());
+            bytes
+        }
     }
 
     #[test]
-    fn test_decode_init_no_te_or_ce() {
+    fn test_decode_init_no_enc() {
         let headers = "Host: example.com\r\n\
                        Content-Type: text/html; charset=utf-8\r\n\
                        Content-Length: 11\r\n\r\n";
         let mut tm =
             TestMessage::build(headers.into(), Body::Raw(INPUT.into()), None);
         let mut buf = BytesMut::new();
         let mut state = DecodeState::init(&mut tm, &mut buf);
+        dbg!(&state);
+        state = state.try_next().unwrap();
+        dbg!(&state);
+        assert!(matches!(state, DecodeState::End));
+        let result = tm.into_bytes();
+        let verify = "Host: example.com\r\n\
+                      Content-Type: text/html; charset=utf-8\r\n\
+                      Content-Length: 11\r\n\r\n\
+                      hello world";
+        assert_eq!(result, verify);
+    }
+
+    #[test]
+    fn test_decode_init_no_enc_extra_body() {
+        let headers = "Host: example.com\r\n\
+                       Content-Type: text/html; charset=utf-8\r\n\
+                       Content-Length: 11\r\n\r\n";
+        let mut tm = TestMessage::build(
+            headers.into(),
+            Body::Raw(INPUT.into()),
+            Some(INPUT.into()),
+        );
+
+        let mut buf = BytesMut::new();
+        let mut state = DecodeState::init(&mut tm, &mut buf);
+        state = state.try_next().unwrap();
+        assert!(matches!(state, DecodeState::UpdateContentLength(_)));
         state = state.try_next().unwrap();
         assert!(matches!(state, DecodeState::End));
+        let result = tm.into_bytes();
+        let verify = "Host: example.com\r\n\
+                      Content-Type: text/html; charset=utf-8\r\n\
+                      Content-Length: 22\r\n\r\n\
+                      hello worldhello world";
+        assert_eq!(result, verify);
     }
 }