test(decompression-plz): added tests for multi compression single header extra body

Author: darkseid-is

decompression-plz/tests/test_cases/both_te_ce.rs

@@ -6,10 +6,10 @@ fn test_both_te_ce() {
     let body: Vec<u8> = all_compressed_data();
     let headers = format!(
         "Host: example.com\r\n\
-         Content-Type: text/html; charset=utf-8\r\n\
-         Transfer-Encoding: gzip, zstd\r\n\
-         Content-Encoding: br, deflate\r\n\
-         Content-Length: {}\r\n\r\n",
+        Content-Type: text/html; charset=utf-8\r\n\
+        Transfer-Encoding: gzip, zstd\r\n\
+        Content-Encoding: br, deflate\r\n\
+        Content-Length: {}\r\n\r\n",
         body.len()
     );
 
@@ -31,9 +31,5 @@ fn test_both_te_ce() {
     assert!(state.is_ended());
 
     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);
+    assert_eq!(result, VERIFY_SINGLE_HEADER_BODY_ONLY);
 }

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

@@ -3,7 +3,6 @@ use header_plz::const_headers::{CONTENT_ENCODING, TRANSFER_ENCODING};
 use super::*;
 pub mod both_te_ce;
 pub mod chunked;
-pub mod extra;
 pub mod multi_compression;
 pub mod no_encodings;
 pub mod partial;
@@ -24,3 +23,13 @@ fn encoding_state(
         panic!("Unknown header");
     }
 }
+
+const VERIFY_SINGLE_HEADER_BODY_ONLY: &str = "Host: example.com\r\n\
+                                    Content-Type: text/html; charset=utf-8\r\n\
+                                    Content-Length: 11\r\n\r\n\
+                                    hello world";
+
+const VERIFY_SINGLE_HEADER_BODY_AND_EXTRA: &str = "Host: example.com\r\n\
+                                    Content-Type: text/html; charset=utf-8\r\n\
+                                    Content-Length: 22\r\n\r\n\
+                                    hello worldhello world";

decompression-plz/tests/test_cases/mod.rs

@@ -0,0 +1,7 @@
+use super::*;
+
+#[test]
+fn assert_decode_state_ce_all_multi_header() {
+    let tm = build_test_message_all_encodings_multi_header(CONTENT_ENCODING);
+    assert_case_multi_compression(tm, CONTENT_ENCODING, VERIFY_MULTI_HEADER);
+}

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

@@ -0,0 +1,4 @@
+use super::*;
+
+mod ce;
+mod te;

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

@@ -0,0 +1,7 @@
+use super::*;
+
+#[test]
+fn assert_decode_state_te_all_multi_header() {
+    let tm = build_test_message_all_encodings_multi_header(TRANSFER_ENCODING);
+    assert_case_multi_compression(tm, TRANSFER_ENCODING, VERIFY_MULTI_HEADER);
+}

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

@@ -1,14 +1,16 @@
 use header_plz::const_headers::{CONTENT_ENCODING, TRANSFER_ENCODING};
 
 use super::*;
+mod body_only;
+mod with_extra;
 
-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";
+const VERIFY_MULTI_HEADER: &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";
 
 fn build_test_message_all_encodings_multi_header(
     header_name: &str,
@@ -44,12 +46,11 @@ fn build_test_message_all_encodings_multi_header(
 #[test]
 fn assert_decode_state_ce_all_multi_header() {
     let tm = build_test_message_all_encodings_multi_header(CONTENT_ENCODING);
-
-    assert_case_multi_compression(tm, CONTENT_ENCODING, VERIFY);
+    assert_case_multi_compression(tm, CONTENT_ENCODING, VERIFY_MULTI_HEADER);
 }
 
 #[test]
 fn assert_decode_state_te_all_multi_header() {
     let tm = build_test_message_all_encodings_multi_header(TRANSFER_ENCODING);
-    assert_case_multi_compression(tm, TRANSFER_ENCODING, VERIFY);
+    assert_case_multi_compression(tm, TRANSFER_ENCODING, VERIFY_MULTI_HEADER);
 }

…_cases/multi_compression/multi_header.rs …es/multi_compression/multi_header/mod.rsdecompression-plz/tests/test_cases/multi_compression/multi_header.rs renamed to decompression-plz/tests/test_cases/multi_compression/multi_header/mod.rs decompression-plz/tests/test_cases/multi_compression/multi_header.rs renamed to decompression-plz/tests/test_cases/multi_compression/multi_header/mod.rs

@@ -0,0 +1,2 @@
+// mod ce;
+mod te;

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

@@ -0,0 +1,4 @@
+//use super::*;
+//mod compressed_separate;
+//mod compressed_together;
+//mod raw;