test: Adjust tests to result packaging to tar

Cargo.toml

@@ -17,6 +17,7 @@ serde = { version = "1.0.166", features = ["derive"] }
 strum = { version = "0.25.0", features = ["derive"] }
 serialport = "4.2.2"
 test-case = "3.3.1"
+tar = "0.4.40"
 
 [dependencies.filevec]
 path = "lib/filevec"

src/command/store_archive.rs

@@ -31,7 +31,6 @@ pub fn store_archive(
 ///
 /// Returns Ok or passes along a file access/unzip process error
 fn unpack_archive(folder: String, bytes: Vec<u8>) -> CommandResult {
-    // Store bytes into temporary file
     // Store bytes into temporary file
     let zip_path = format!("./data/{}.zip", folder);
     let mut zip_file = std::fs::File::create(&zip_path)?;

tests/simulation/full_run.rs

@@ -17,10 +17,15 @@ fn full_run() {
 
     // Check result
     let result = simulate_return_result(&mut com, 1, 3).unwrap();
-    let mut result_archive = zip::ZipArchive::new(Cursor::new(result)).unwrap();
+    let mut result_archive = tar::Archive::new(Cursor::new(result));
     com.send_packet(&CEPPacket::Ack).unwrap();
 
-    let result_file = result_archive.by_name(&"3").unwrap();
+    let result_file = result_archive
+        .entries()
+        .unwrap()
+        .find(|x| x.as_ref().unwrap().header().path().unwrap().ends_with("3"))
+        .unwrap()
+        .unwrap();
     assert_eq!(result_file.bytes().map(|b| b.unwrap()).collect::<Vec<_>>(), vec![0xde, 0xad]);
 
     assert_eq!(simulate_get_status(&mut com).unwrap(), [0]);

tests/software_tests/return_result.rs

@@ -26,10 +26,8 @@ fn returns_result_correctly() -> TestResult {
         COBC(Data(return_result(7, 3))),
         EDU(Ack),
         ACTION(Box::new(|packet| {
-            std::fs::File::create("tests/tmp/7.zip")
-                .unwrap()
-                .write(&packet.clone().serialize())
-                .unwrap();
+            let bytes = packet.clone().serialize();
+            std::fs::write("tests/tmp/7.tar", &bytes[3..bytes.len()-4]).unwrap();
         })),
         COBC(Ack),
         EDU(Eof),
@@ -46,10 +44,10 @@ fn returns_result_correctly() -> TestResult {
     command::handle_command(&mut com, &mut exec);
     assert!(com.is_complete());
 
-    std::process::Command::new("unzip")
+    std::process::Command::new("tar")
         .current_dir("./tests/tmp")
-        .arg("-o")
-        .arg("7.zip")
+        .arg("xf")
+        .arg("7.tar")
         .status()?;
 
     assert_eq!(std::fs::read("tests/tmp/3")?, vec![0xde, 0xad]);
@@ -80,7 +78,7 @@ fn truncate_result() -> TestResult {
     command::handle_command(&mut com, &mut exec);
     assert!(com.is_complete());
 
-    assert!(std::fs::File::open("./data/8_5.zip")?.metadata()?.len() < 1_001_000);
+    assert!(std::fs::File::open("./data/8_5.tar")?.metadata()?.len() < 1_005_000);
 
     common::cleanup("8");
     Ok(())
@@ -122,7 +120,7 @@ fn stopped_return() -> TestResult {
     command::handle_command(&mut com, &mut exec);
     assert!(com.is_complete());
 
-    assert!(std::fs::File::open("./data/9_5.zip").is_ok());
+    assert!(std::fs::File::open("./data/9_5.tar").is_ok());
 
     common::cleanup("9");
     Ok(())
@@ -162,7 +160,7 @@ fn result_is_not_deleted_after_corrupted_transfer() -> TestResult {
     command::handle_command(&mut com, &mut exec);
     assert!(com.is_complete());
 
-    assert!(std::fs::File::open("./data/50_0.zip").is_ok());
+    assert!(std::fs::File::open("./data/50_0.tar").is_ok());
 
     common::cleanup("50");
     Ok(())