Make lzma test case pass

bearcove · Jan 26, 2024 · 7038eb1 · 7038eb1
1 parent f480928
commit 7038eb1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 180 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/rc-zip/Cargo.toml b/crates/rc-zip/Cargo.toml
@@ -27,8 +27,7 @@ flate2 = { version = "1.0.28", optional = true }
 num_enum = "0.7.2"
 byteorder = "1.5.0"
 cfg-if = "1.0.0"
-# lzma-rs = { version = "0.3.0", features = ["raw_decoder", "enable_logging"], optional = true }
-lzma-rs = { path = "../../../lzma-rs", features = ["raw_decoder", "stream", "enable_logging"], optional = true }
+lzma-rs = { version = "0.3.0", features = ["stream"], optional = true }
 
 [features]
 default = ["sync", "file", "deflate"]

diff --git a/crates/rc-zip/src/reader/sync/entry_reader/lzma_support.rs b/crates/rc-zip/src/reader/sync/entry_reader/lzma_support.rs
@@ -8,7 +8,7 @@ use crate::{
 };
 
 enum LzmaDecoderState {
-    Writing(Stream<Vec<u8>>),
+    Writing(Box<Stream<Vec<u8>>>),
     Draining(Vec<u8>),
     Transition,
 }
@@ -163,6 +163,6 @@ pub(crate) fn mk_decoder(
     Ok(Box::new(LzmaDecoderAdapter {
         input: r,
         total_write_count: 0,
-        state: LzmaDecoderState::Writing(stream),
+        state: LzmaDecoderState::Writing(Box::new(stream)),
     }))
 }
diff --git a/crates/rc-zip/src/tests.rs b/crates/rc-zip/src/tests.rs
@@ -123,10 +123,14 @@ impl ZipTestFile {
                         // ah well
                     }
                     FileContent::Bytes(expected_bytes) => {
+                        // first check length
+                        assert_eq!(actual_bytes.len(), expected_bytes.len());
                         assert_eq!(&actual_bytes[..], &expected_bytes[..])
                     }
                     FileContent::File(file_path) => {
                         let expected_bytes = std::fs::read(zips_dir().join(file_path)).unwrap();
+                        // first check length
+                        assert_eq!(actual_bytes.len(), expected_bytes.len());
                         assert_eq!(&actual_bytes[..], &expected_bytes[..])
                     }
                 }
@@ -272,7 +276,7 @@ fn test_cases() -> Vec<ZipTest> {
             expected_encoding: Some(Encoding::Utf8),
             files: vec![ZipTestFile {
                 name: "found-me.txt",
-                content: FileContent::Bytes("Oh no, you found me!\n".repeat(5000).into()),
+                content: FileContent::Bytes("Oh no, you found me\n".repeat(5000).into()),
                 modified: Some(date((2024, 1, 26), (17, 14, 36), 0, time_zone(0)).unwrap()),
                 ..Default::default()
             }],