test(decompression-plz): added tests for single and multi compression

Author: darkseid-is

decompression-plz/src/decompression/dstruct.rs

@@ -301,12 +301,12 @@ mod tests {
     fn test_push_last_encoding_multi_header() {
         let encoding_info = all_encoding_info_multi_header();
         let to_verify = 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(1, vec![ContentEncoding::Brotli]),
+            EncodingInfo::new(3, vec![ContentEncoding::Deflate]),
+            EncodingInfo::new(5, vec![ContentEncoding::Identity]),
+            EncodingInfo::new(7, vec![ContentEncoding::Gzip]),
             EncodingInfo::new(
-                4,
+                9,
                 vec![ContentEncoding::Zstd, ContentEncoding::Brotli],
             ),
         ];

decompression-plz/tests-utils/src/lib.rs

@@ -7,6 +7,8 @@ use header_plz::body_headers::{
 
 pub const INPUT: &[u8] = b"hello world";
 
+pub const ALL_COMPRESSIONS: &str = "br, deflate, gzip, zstd";
+
 pub fn all_compressed_data() -> Vec<u8> {
     let brotli_compressed = compress_brotli(INPUT);
     let deflate_compressed = compress_deflate(&brotli_compressed);
@@ -29,11 +31,11 @@ pub fn single_compression(encoding: &ContentEncoding) -> Vec<u8> {
 
 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]),
+        EncodingInfo::new(1, vec![ContentEncoding::Brotli]),
+        EncodingInfo::new(3, vec![ContentEncoding::Deflate]),
+        EncodingInfo::new(5, vec![ContentEncoding::Identity]),
+        EncodingInfo::new(7, vec![ContentEncoding::Gzip]),
+        EncodingInfo::new(9, vec![ContentEncoding::Zstd]),
     ]
 }
 

decompression-plz/tests/test_cases/mod.rs

@@ -1,3 +1,4 @@
 use super::*;
+pub mod multi_compression;
 pub mod no_encodings;
 pub mod single_compression;

decompression-plz/tests/test_cases/multi_compression/mod.rs

@@ -0,0 +1,24 @@
+use header_plz::body_headers::content_encoding::ContentEncoding;
+use tests_utils::{ALL_COMPRESSIONS, all_compressed_data};
+
+use super::*;
+mod multi_header;
+mod single_header;
+
+fn run_case_multi_compression(
+    f: fn(&DecodeState<TestMessage>) -> bool,
+    mut tm: TestMessage,
+    verify: &str,
+) {
+    let mut buf = BytesMut::new();
+    let mut state = DecodeState::init(&mut tm, &mut buf);
+    state = state.try_next().unwrap();
+    assert!((f)(&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();
+    assert_eq!(result, verify);
+}

decompression-plz/tests/test_cases/multi_compression/multi_header.rs

@@ -0,0 +1,62 @@
+use header_plz::const_headers::{CONTENT_ENCODING, TRANSFER_ENCODING};
+
+use super::*;
+
+fn build_test_message_all_encodings_multi_header(
+    header_name: &str,
+) -> TestMessage {
+    let body: Vec<u8> = all_compressed_data();
+    let headers = format!(
+        "Host: example.com\r\n\
+        {}: br\r\n\
+        Content-Type: text/html; charset=utf-8\r\n\
+        {}: deflate\r\n\
+        random: random\r\n\
+        {}: identity\r\n\
+        another-random: random\r\n\
+        {}: gzip\r\n\
+        test-header: test-header\r\n\
+        {}: zstd\r\n\
+        Content-Length: {}\r\n\r\n",
+        header_name,
+        header_name,
+        header_name,
+        header_name,
+        header_name,
+        body.len()
+    );
+
+    let mut tm = TestMessage::build(
+        headers.as_bytes().into(),
+        Body::Raw(body.as_slice().into()),
+        None,
+    );
+    tm
+}
+
+const VERIFY: &str = "Host: example.com\r\n\
+        Content-Type: text/html; charset=utf-8\r\n\
+        random: random\r\n\
+        another-random: random\r\n\
+        test-header: test-header\r\n\
+        Content-Length: 11\r\n\r\n\
+        hello world";
+
+#[test]
+fn assert_decode_state_ce_all_multi_header() {
+    let tm = build_test_message_all_encodings_multi_header(CONTENT_ENCODING);
+
+    let f = move |s: &DecodeState<TestMessage>| {
+        matches!(s, DecodeState::ContentEncoding(_, _))
+    };
+    run_case_multi_compression(f, tm, VERIFY);
+}
+
+#[test]
+fn assert_decode_state_te_all_multi_header() {
+    let tm = build_test_message_all_encodings_multi_header(TRANSFER_ENCODING);
+    let f = move |s: &DecodeState<TestMessage>| {
+        matches!(s, DecodeState::TransferEncoding(_, _))
+    };
+    run_case_multi_compression(f, tm, VERIFY);
+}

decompression-plz/tests/test_cases/multi_compression/single_header.rs

@@ -0,0 +1,49 @@
+use header_plz::const_headers::{CONTENT_ENCODING, TRANSFER_ENCODING};
+
+use super::*;
+
+fn build_test_message_all_encodings_single_header(
+    header_name: &str,
+) -> TestMessage {
+    let body: Vec<u8> = all_compressed_data();
+    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",
+        header_name,
+        ALL_COMPRESSIONS,
+        body.len()
+    );
+
+    let mut tm = TestMessage::build(
+        headers.as_bytes().into(),
+        Body::Raw(body.as_slice().into()),
+        None,
+    );
+    tm
+}
+
+const VERIFY: &str = "Host: example.com\r\n\
+                Content-Type: text/html; charset=utf-8\r\n\
+                Content-Length: 11\r\n\r\n\
+                hello world";
+
+#[test]
+fn assert_decode_state_ce_all_single_header() {
+    let tm = build_test_message_all_encodings_single_header(CONTENT_ENCODING);
+
+    let f = move |s: &DecodeState<TestMessage>| {
+        matches!(s, DecodeState::ContentEncoding(_, _))
+    };
+    run_case_multi_compression(f, tm, VERIFY);
+}
+
+#[test]
+fn assert_decode_state_te_all_single_header() {
+    let tm = build_test_message_all_encodings_single_header(TRANSFER_ENCODING);
+    let f = move |s: &DecodeState<TestMessage>| {
+        matches!(s, DecodeState::TransferEncoding(_, _))
+    };
+    run_case_multi_compression(f, tm, VERIFY);
+}

decompression-plz/tests/test_cases/single_compression.rs

@@ -3,7 +3,10 @@ use tests_utils::single_compression;
 
 use super::*;
 
-fn run_case(case: &Case, content_encoding: ContentEncoding) {
+fn run_case_single_compression(
+    case: &Case,
+    content_encoding: ContentEncoding,
+) {
     let body: Vec<u8> = single_compression(&content_encoding);
     let headers = format!(
         "Host: example.com\r\n\
@@ -45,7 +48,7 @@ fn assert_decode_state_single_te_brotli() {
         header_name: "Transfer-Encoding",
         expected_state: |s| matches!(s, DecodeState::TransferEncoding(_, _)),
     };
-    run_case(&case, ContentEncoding::Brotli);
+    run_case_single_compression(&case, ContentEncoding::Brotli);
 }
 
 #[test]
@@ -54,7 +57,7 @@ fn assert_decode_state_single_te_compress() {
         header_name: "Transfer-Encoding",
         expected_state: |s| matches!(s, DecodeState::TransferEncoding(_, _)),
     };
-    run_case(&case, ContentEncoding::Compress);
+    run_case_single_compression(&case, ContentEncoding::Compress);
 }
 
 #[test]
@@ -63,7 +66,7 @@ fn assert_decode_state_single_te_deflate() {
         header_name: "Transfer-Encoding",
         expected_state: |s| matches!(s, DecodeState::TransferEncoding(_, _)),
     };
-    run_case(&case, ContentEncoding::Deflate);
+    run_case_single_compression(&case, ContentEncoding::Deflate);
 }
 
 #[test]
@@ -72,7 +75,7 @@ fn assert_decode_state_single_te_gzip() {
         header_name: "Transfer-Encoding",
         expected_state: |s| matches!(s, DecodeState::TransferEncoding(_, _)),
     };
-    run_case(&case, ContentEncoding::Gzip);
+    run_case_single_compression(&case, ContentEncoding::Gzip);
 }
 
 #[test]
@@ -81,7 +84,7 @@ fn assert_decode_state_single_te_identity() {
         header_name: "Transfer-Encoding",
         expected_state: |s| matches!(s, DecodeState::TransferEncoding(_, _)),
     };
-    run_case(&case, ContentEncoding::Identity);
+    run_case_single_compression(&case, ContentEncoding::Identity);
 }
 
 #[test]
@@ -90,7 +93,7 @@ fn assert_decode_state_single_te_zstd() {
         header_name: "Transfer-Encoding",
         expected_state: |s| matches!(s, DecodeState::TransferEncoding(_, _)),
     };
-    run_case(&case, ContentEncoding::Zstd);
+    run_case_single_compression(&case, ContentEncoding::Zstd);
 }
 
 // CE only
@@ -100,7 +103,7 @@ fn assert_decode_state_single_ce_brotli() {
         header_name: "Content-Encoding",
         expected_state: |s| matches!(s, DecodeState::ContentEncoding(_, _)),
     };
-    run_case(&case, ContentEncoding::Brotli);
+    run_case_single_compression(&case, ContentEncoding::Brotli);
 }
 
 #[test]
@@ -109,7 +112,7 @@ fn assert_decode_state_single_ce_compress() {
         header_name: "Content-Encoding",
         expected_state: |s| matches!(s, DecodeState::ContentEncoding(_, _)),
     };
-    run_case(&case, ContentEncoding::Compress);
+    run_case_single_compression(&case, ContentEncoding::Compress);
 }
 
 #[test]
@@ -118,7 +121,7 @@ fn assert_decode_state_single_ce_deflate() {
         header_name: "Content-Encoding",
         expected_state: |s| matches!(s, DecodeState::ContentEncoding(_, _)),
     };
-    run_case(&case, ContentEncoding::Deflate);
+    run_case_single_compression(&case, ContentEncoding::Deflate);
 }
 
 #[test]
@@ -127,7 +130,7 @@ fn assert_decode_state_single_ce_gzip() {
         header_name: "Content-Encoding",
         expected_state: |s| matches!(s, DecodeState::ContentEncoding(_, _)),
     };
-    run_case(&case, ContentEncoding::Gzip);
+    run_case_single_compression(&case, ContentEncoding::Gzip);
 }
 
 #[test]
@@ -136,7 +139,7 @@ fn assert_decode_state_single_ce_identity() {
         header_name: "Content-Encoding",
         expected_state: |s| matches!(s, DecodeState::ContentEncoding(_, _)),
     };
-    run_case(&case, ContentEncoding::Identity);
+    run_case_single_compression(&case, ContentEncoding::Identity);
 }
 
 #[test]
@@ -145,5 +148,5 @@ fn assert_decode_state_single_ce_zstd() {
         header_name: "Content-Encoding",
         expected_state: |s| matches!(s, DecodeState::ContentEncoding(_, _)),
     };
-    run_case(&case, ContentEncoding::Zstd);
+    run_case_single_compression(&case, ContentEncoding::Zstd);
 }