better testing

decompals · Dec 5, 2023 · 0b4360c · 0b4360c
1 parent c6fc90a
commit 0b4360c
Show file tree

Hide file tree

Showing 23 changed files with 310 additions and 21 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,4 +8,7 @@ license = "MIT"
 
 [dependencies]
 clap = { version = "4.4.10", features = ["derive"] }
-thiserror = "1.0"
+thiserror = "1.0"
+
+[dev-dependencies]
+rstest = "0.18.2"
diff --git a/src/yay0.rs b/src/yay0.rs
@@ -228,37 +228,61 @@ fn search(
 
 #[cfg(test)]
 mod tests {
-    #[test]
-    fn test_matching_decompression() {
-        let compressed_file = include_bytes!("../test_data/1.Yay0");
-        let decompressed_file = include_bytes!("../test_data/1.bin");
+    use core::panic;
+    use rstest::rstest;
+    use std::{
+        fs::File,
+        io::{BufReader, Read},
+        path::PathBuf,
+    };
+
+    pub fn read_test_file(path: PathBuf) -> Vec<u8> {
+        let file = match File::open(path) {
+            Ok(file) => file,
+            Err(_error) => {
+                panic!("Failed to open file");
+            }
+        };
+
+        let mut buf_reader = BufReader::new(file);
+        let mut buffer = Vec::new();
+
+        let _ = buf_reader.read_to_end(&mut buffer);
+
+        buffer
+    }
+
+    #[rstest]
+    fn test_matching_decompression(#[files("test_data/*.Yay0")] path: PathBuf) {
+        let compressed_file = &read_test_file(path.clone());
+        let decompressed_file = &read_test_file(path.with_extension(""));
 
         let decompressed: Box<[u8]> = super::decompress_yay0(compressed_file);
         assert_eq!(decompressed_file, decompressed.as_ref());
     }
 
-    #[test]
-    fn test_matching_compression() {
-        let compressed_file = include_bytes!("../test_data/1.Yay0");
-        let decompressed_file = include_bytes!("../test_data/1.bin");
+    #[rstest]
+    fn test_matching_compression(#[files("test_data/*.Yay0")] path: PathBuf) {
+        let compressed_file = &read_test_file(path.clone());
+        let decompressed_file = &read_test_file(path.with_extension(""));
 
         let compressed = super::compress_yay0(decompressed_file.as_slice());
         assert_eq!(compressed_file, compressed.as_ref());
     }
 
-    #[test]
-    fn test_cycle_decompressed() {
-        let decompressed_file = include_bytes!("../test_data/1.bin");
+    #[rstest]
+    fn test_cycle_decompressed(#[files("test_data/*.Yay0")] path: PathBuf) {
+        let decompressed_file = &read_test_file(path.with_extension(""));
 
         assert_eq!(
             decompressed_file,
             super::decompress_yay0(&super::compress_yay0(decompressed_file.as_ref())).as_ref()
         );
     }
 
-    #[test]
-    fn test_cycle_compressed() {
-        let compressed_file = include_bytes!("../test_data/1.Yay0");
+    #[rstest]
+    fn test_cycle_compressed(#[files("test_data/*.Yay0")] path: PathBuf) {
+        let compressed_file = &read_test_file(path);
 
         assert_eq!(
             compressed_file,

diff --git a/src/yaz0.rs b/src/yaz0.rs
@@ -238,25 +238,25 @@ fn search(
 mod tests {
     #[test]
     fn test_matching_decompression() {
-        let compressed_file = include_bytes!("../test_data/1.Yaz0");
-        let decompressed_file = include_bytes!("../test_data/1.bin");
+        let compressed_file = include_bytes!("../test_data/small.txt.Yaz0");
+        let decompressed_file = include_bytes!("../test_data/small.txt");
 
         let decompressed: Box<[u8]> = super::decompress_yaz0(compressed_file);
         assert_eq!(decompressed_file, decompressed.as_ref());
     }
 
     #[test]
     fn test_matching_compression() {
-        let compressed_file = include_bytes!("../test_data/1.Yaz0");
-        let decompressed_file = include_bytes!("../test_data/1.bin");
+        let compressed_file = include_bytes!("../test_data/small.txt.Yaz0");
+        let decompressed_file = include_bytes!("../test_data/small.txt");
 
         let compressed = super::compress_yaz0(decompressed_file.as_slice());
         assert_eq!(compressed_file, compressed.as_ref());
     }
 
     #[test]
     fn test_cycle_decompressed() {
-        let decompressed_file = include_bytes!("../test_data/1.bin");
+        let decompressed_file = include_bytes!("../test_data/small.txt");
 
         assert_eq!(
             decompressed_file,
@@ -266,7 +266,7 @@ mod tests {
 
     #[test]
     fn test_cycle_compressed() {
-        let compressed_file = include_bytes!("../test_data/1.Yaz0");
+        let compressed_file = include_bytes!("../test_data/small.txt.Yaz0");
 
         assert_eq!(
             compressed_file,

diff --git a/test_data/dirt.png b/test_data/dirt.png
diff --git a/test_data/dirt.png.Yay0 b/test_data/dirt.png.Yay0
diff --git a/test_data/dirt.png.bin b/test_data/dirt.png.bin
diff --git a/test_data/dirt.png.bin.Yay0 b/test_data/dirt.png.bin.Yay0
diff --git a/test_data/ground.png b/test_data/ground.png
diff --git a/test_data/ground.png.Yay0 b/test_data/ground.png.Yay0
diff --git a/test_data/ground.png.bin b/test_data/ground.png.bin
diff --git a/test_data/ground.png.bin.Yay0 b/test_data/ground.png.bin.Yay0
diff --git a/test_data/1.bin → test_data/small.txt b/test_data/1.bin → test_data/small.txt
diff --git a/test_data/1.Yay0 → test_data/small.txt.Yay0 b/test_data/1.Yay0 → test_data/small.txt.Yay0
diff --git a/test_data/1.Yaz0 → test_data/small.txt.Yaz0 b/test_data/1.Yaz0 → test_data/small.txt.Yaz0
diff --git a/test_data/stones.png b/test_data/stones.png
diff --git a/test_data/stones.png.Yay0 b/test_data/stones.png.Yay0
diff --git a/test_data/stones.png.bin b/test_data/stones.png.bin
diff --git a/test_data/stones.png.bin.Yay0 b/test_data/stones.png.bin.Yay0
diff --git a/test_data/tile.png b/test_data/tile.png
diff --git a/test_data/tile.png.Yay0 b/test_data/tile.png.Yay0
diff --git a/test_data/tile.png.bin b/test_data/tile.png.bin
diff --git a/test_data/tile.png.bin.Yay0 b/test_data/tile.png.bin.Yay0