fix the test failure for reviwing the archive files and update the codes

tamada · May 1, 2024 · 2565a24 · 2565a24
1 parent 6222dfe
commit 2565a24
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/src/extractor/tar.rs b/src/extractor/tar.rs
@@ -94,7 +94,8 @@ fn list_tar<R: Read>(archive: &mut tar::Archive<R>) -> Result<Vec<String>> {
     let mut result = Vec::<String>::new();
     for entry in archive.entries().unwrap() {
         let entry = entry.unwrap();
-        result.push(format!("{:?}", entry.header().path().unwrap()));
+        let path = entry.header().path().unwrap();
+        result.push(format!("{}", path.to_str().unwrap()));
     }
     Ok(result)
 }
@@ -109,7 +110,7 @@ mod tests {
         let file = PathBuf::from("testdata/test.tar");
         match extractor.list_archives(file) {
             Ok(r) => {
-                assert_eq!(r.len(), 18);
+                assert_eq!(r.len(), 16);
                 assert_eq!(r.get(0), Some("Cargo.toml".to_string()).as_ref());
                 assert_eq!(r.get(1), Some("build.rs".to_string()).as_ref());
                 assert_eq!(r.get(2), Some("LICENSE".to_string()).as_ref());
@@ -125,7 +126,7 @@ mod tests {
         let file = PathBuf::from("testdata/test.tar.bz2");
         match extractor.list_archives(file) {
             Ok(r) => {
-                assert_eq!(r.len(), 18);
+                assert_eq!(r.len(), 16);
                 assert_eq!(r.get(0), Some("Cargo.toml".to_string()).as_ref());
                 assert_eq!(r.get(1), Some("build.rs".to_string()).as_ref());
                 assert_eq!(r.get(2), Some("LICENSE".to_string()).as_ref());
@@ -141,7 +142,7 @@ mod tests {
         let file = PathBuf::from("testdata/test.tar.gz");
         match extractor.list_archives(file) {
             Ok(r) => {
-                assert_eq!(r.len(), 18);
+                assert_eq!(r.len(), 16);
                 assert_eq!(r.get(0), Some("Cargo.toml".to_string()).as_ref());
                 assert_eq!(r.get(1), Some("build.rs".to_string()).as_ref());
                 assert_eq!(r.get(2), Some("LICENSE".to_string()).as_ref());

diff --git a/src/extractor/zip.rs b/src/extractor/zip.rs
@@ -55,7 +55,7 @@ mod tests {
         let file = PathBuf::from("testdata/test.zip");
         match extractor.list_archives(file) {
             Ok(r) => {
-                assert_eq!(r.len(), 18);
+                assert_eq!(r.len(), 19);
                 assert_eq!(r.get(0), Some("Cargo.toml".to_string()).as_ref());
                 assert_eq!(r.get(1), Some("build.rs".to_string()).as_ref());
                 assert_eq!(r.get(2), Some("LICENSE".to_string()).as_ref());

diff --git a/testdata/test.tar b/testdata/test.tar
diff --git a/testdata/test.tar.bz2 b/testdata/test.tar.bz2
diff --git a/testdata/test.tar.gz b/testdata/test.tar.gz
diff --git a/testdata/test.zip b/testdata/test.zip