test(decompression-plz): moved utils to new shared crate tests-utils

Author: darkseid-is

Cargo.lock

@@ -21,3 +21,7 @@ zstd = "0.13.3"
 bytes = { workspace = true }
 thiserror = { workspace = true }
 tracing = { workspace = true }
+
+
+[dev-dependencies]
+tests-utils = { path = "tests-utils" }

decompression-plz/Cargo.toml

@@ -196,16 +196,10 @@ impl<'a> DecompressionStruct<'a> {
 #[cfg(test)]
 mod tests {
     use bytes::BufMut;
+    use tests_utils::*;
 
     use crate::decompression::multi::error::MultiDecompressErrorReason;
-    use crate::{
-        decompression::single::error::DecompressError,
-        tests::{
-            INPUT, all_encoding_info_multi_header,
-            all_encoding_info_single_header, compress_brotli,
-            compress_deflate, compress_gzip, compress_zstd,
-        },
-    };
+    use crate::decompression::single::error::DecompressError;
 
     use super::*;
 

decompression-plz/src/decompression/dstruct.rs

@@ -44,8 +44,9 @@ pub fn is_compressed(input: &[u8], encoding: &ContentEncoding) -> bool {
 #[cfg(test)]
 mod tests {
     use header_plz::body_headers::content_encoding::ContentEncoding;
+    use tests_utils::*;
 
-    use crate::{decompression::magic_bytes::is_compressed, tests::*};
+    use crate::decompression::magic_bytes::is_compressed;
 
     #[test]
     fn test_magic_bytes_deflate() {

decompression-plz/src/decompression/magic_bytes.rs

@@ -57,9 +57,9 @@ where
 mod tests {
 
     use super::*;
-    use crate::tests::*;
     use bytes::BufMut;
     use header_plz::body_headers::content_encoding::ContentEncoding;
+    use tests_utils::*;
 
     #[test]
     fn test_decompress_multi_single_header() {

decompression-plz/src/decompression/multi/mod.rs

@@ -92,10 +92,10 @@ pub mod tests {
     use bytes::{BufMut, BytesMut};
 
     use header_plz::body_headers::content_encoding::ContentEncoding;
+    use tests_utils::*;
 
-    use crate::{
-        decompression::single::{decompress_single, error::DecompressError},
-        tests::*,
+    use crate::decompression::single::{
+        decompress_single, error::DecompressError,
     };
 
     fn test_decompress(

decompression-plz/src/decompression/single/mod.rs

@@ -222,7 +222,7 @@ mod tests {
     use bytes::BytesMut;
     use header_plz::body_headers::content_encoding::ContentEncoding;
 
-    use crate::tests::*;
+    use tests_utils::*;
 
     // ----- Main
     fn assert_main_only_finish_flow(

decompression-plz/src/decompression/state.rs

@@ -29,100 +29,3 @@ where
 
     Ok(())
 }
-
-// helper function for tests
-#[cfg(test)]
-pub mod tests {
-    use crate::DecompressTrait;
-    use body_plz::variants::Body;
-    use bytes::BytesMut;
-    use flate2::Compression;
-    use header_plz::{
-        InfoLine,
-        body_headers::{
-            content_encoding::ContentEncoding, encoding_info::EncodingInfo,
-        },
-    };
-    use std::io::Write;
-    pub const INPUT: &[u8] = b"hello world";
-
-    pub fn all_compressed_data() -> Vec<u8> {
-        let brotli_compressed = compress_brotli(INPUT);
-        let deflate_compressed = compress_deflate(&brotli_compressed);
-        let gzip_compressed = compress_gzip(&deflate_compressed);
-        compress_zstd(&gzip_compressed)
-    }
-
-    pub fn single_compression(encoding: &ContentEncoding) -> Vec<u8> {
-        match encoding {
-            ContentEncoding::Brotli => compress_brotli(INPUT),
-            ContentEncoding::Deflate => compress_deflate(INPUT),
-            ContentEncoding::Gzip => compress_gzip(INPUT),
-            ContentEncoding::Zstd | ContentEncoding::Compress => {
-                compress_zstd(INPUT)
-            }
-            ContentEncoding::Identity => INPUT.to_vec(),
-            _ => panic!(),
-        }
-    }
-
-    pub fn all_encoding_info_multi_header() -> Vec<EncodingInfo> {
-        vec![
-            EncodingInfo::new(0, vec![ContentEncoding::Brotli]),
-            EncodingInfo::new(1, vec![ContentEncoding::Deflate]),
-            EncodingInfo::new(2, vec![ContentEncoding::Identity]),
-            EncodingInfo::new(3, vec![ContentEncoding::Gzip]),
-            EncodingInfo::new(4, vec![ContentEncoding::Zstd]),
-        ]
-    }
-
-    pub fn all_encoding_info_single_header() -> Vec<EncodingInfo> {
-        vec![EncodingInfo::new(
-            0,
-            vec![
-                ContentEncoding::Brotli,
-                ContentEncoding::Deflate,
-                ContentEncoding::Identity,
-                ContentEncoding::Gzip,
-                ContentEncoding::Zstd,
-            ],
-        )]
-    }
-
-    pub fn compress_brotli(data: &[u8]) -> Vec<u8> {
-        let mut compressed = Vec::new();
-        {
-            let mut writer =
-                brotli::CompressorWriter::new(&mut compressed, 4096, 0, 22);
-            writer.write_all(data).unwrap();
-            writer.flush().unwrap();
-        }
-        compressed
-    }
-
-    pub fn compress_deflate(data: &[u8]) -> Vec<u8> {
-        let mut compressed = Vec::new();
-        let mut encoder = flate2::write::ZlibEncoder::new(
-            &mut compressed,
-            Compression::fast(),
-        );
-        encoder.write_all(data).unwrap();
-        encoder.finish().unwrap();
-        compressed
-    }
-
-    pub fn compress_gzip(data: &[u8]) -> Vec<u8> {
-        let mut compressed = Vec::new();
-        let mut encoder = flate2::write::GzEncoder::new(
-            &mut compressed,
-            Compression::fast(),
-        );
-        encoder.write_all(data).unwrap();
-        encoder.finish().unwrap();
-        compressed
-    }
-
-    pub fn compress_zstd(data: &[u8]) -> Vec<u8> {
-        zstd::encode_all(data, 1).unwrap()
-    }
-}

decompression-plz/src/lib.rs

@@ -326,49 +326,5 @@ mod tests {
         assert_decode_state_te_only_single(ContentEncoding::Zstd);
     }
 
-    fn run_case(case: &Case, content_encoding: ContentEncoding) {
-        let body = single_compression(&content_encoding);
-        let headers = format!(
-            "Host: example.com\r\n\
-         Content-Type: text/html; charset=utf-8\r\n\
-         {}: {}\r\n\
-         Content-Length: {}\r\n\r\n",
-            case.header_name,
-            content_encoding.as_ref(),
-            body.len()
-        );
-
-        let mut tm = TestMessage::build(
-            headers.as_bytes().into(),
-            Body::Raw(body.as_slice().into()),
-            None,
-        );
-        let mut buf = BytesMut::new();
-        let mut state = DecodeState::init(&mut tm, &mut buf);
-        state = state.try_next().unwrap();
-        assert!((case.expected_state)(&state));
-        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: 11\r\n\r\n\
-                  hello world";
-        assert_eq!(result, verify);
-    }
-
-    #[test]
-    fn assert_decode_states_single() {
-        let case = Case {
-            header_name: "Transfer-Encoding",
-            expected_state: |s| {
-                matches!(s, DecodeState::TransferEncoding(_, _))
-            },
-        };
-        run_case(&case, ContentEncoding::Brotli);
-    }
 }
 */

decompression-plz/src/state.rs

@@ -0,0 +1,13 @@
+[package]
+name = "tests-utils"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+header-plz = "0.0.25"
+body-plz = "0.0.30"
+
+# Compression
+brotli = "8.0.0"
+flate2 = "1.1.0"
+zstd = "0.13.3"