Anyhow introduced / Decouple Image from Lib interface / Integration T…

…ests

Cargo.toml

@@ -7,4 +7,8 @@ edition = "2021"
 
 [dependencies]
 image = "0.25.1"
-clap = { version = "4.0", features = ["derive"] }
+clap = { version = "4.0", features = ["derive"] }
+anyhow = "1.0.87"
+
+assert_cmd = "2.0.16"
+predicates = "3.1.2"

src/coder/decoder.rs

@@ -3,18 +3,15 @@ mod decode;
 mod header_decoder;
 mod rgb_decoder;
 
-use std::error::Error;
-
-use image::RgbaImage;
+use anyhow::Result;
 
 use self::{alpha_decoder::AlphaDecoder, decode::Decode, rgb_decoder::RgbDecoder};
 
 use super::header::{AlgHeader, Header};
 
-pub fn decode(image: RgbaImage) -> Result<(String, Vec<u8>), Box<dyn Error>> {
-    let mut buffer = image.into_raw();
-    let header = header_decoder::decode(&buffer)?;
-    let buffer = buffer.split_off(header.size() * 4);
+pub fn decode(mut image_buffer: Vec<u8>) -> Result<(String, Vec<u8>)> {
+    let header = header_decoder::decode(&image_buffer)?;
+    let buffer = image_buffer.split_off(header.size() * 4);
 
     let decoder = create_decoder(&header, &buffer);
     let decoded = decoder.decode()?;

src/coder/decoder/alpha_decoder.rs

@@ -36,10 +36,8 @@ mod tests {
         let decoder = create_decoder(&buffer);
         let decoded = decoder.decode();
         assert_eq!(
-            decoded,
-            Err(DecodeError(
-                "Not enough data to decode filename length".to_string()
-            ))
+            decoded.unwrap_err().downcast::<DecodeError>().unwrap(),
+            DecodeError("Not enough data to decode filename length".to_string())
         );
     }
 
@@ -60,10 +58,8 @@ mod tests {
         let decoder = create_decoder(&buffer);
         let decoded = decoder.decode();
         assert_eq!(
-            decoded,
-            Err(DecodeError(
-                "Not enough data to decode filename".to_string()
-            ))
+            decoded.unwrap_err().downcast::<DecodeError>().unwrap(),
+            DecodeError("Not enough data to decode filename".to_string())
         );
     }
 
@@ -82,10 +78,8 @@ mod tests {
         let decoder = create_decoder(&buffer);
         let decoded = decoder.decode();
         assert_eq!(
-            decoded,
-            Err(DecodeError(
-                "Not enough data to decode data length".to_string()
-            ))
+            decoded.unwrap_err().downcast::<DecodeError>().unwrap(),
+            DecodeError("Not enough data to decode data length".to_string())
         );
     }
 
@@ -128,8 +122,8 @@ mod tests {
         let decoder = create_decoder(&buffer);
         let decoded = decoder.decode();
         assert_eq!(
-            decoded,
-            Err(DecodeError("Not enough data to decode data".to_string()))
+            decoded.unwrap_err().downcast::<DecodeError>().unwrap(),
+            DecodeError("Not enough data to decode data".to_string())
         );
     }
 

src/coder/decoder/decode.rs

@@ -1,7 +1,9 @@
+use anyhow::Result;
+
 use crate::coder::error::DecodeError;
 
 pub trait Decode {
-    fn decode(mut self: Box<Self>) -> Result<(String, Vec<u8>), DecodeError> {
+    fn decode(mut self: Box<Self>) -> Result<(String, Vec<u8>)> {
         let file_name_length = self
             .decode_length()
             .ok_or(self.not_available("filename length"))?;

src/coder/decoder/rgb_decoder.rs

@@ -53,10 +53,8 @@ mod tests {
         let decoded = decoder.decode();
 
         assert_eq!(
-            decoded,
-            Err(DecodeError(
-                "Not enough data to decode filename length".to_string()
-            ))
+            decoded.unwrap_err().downcast::<DecodeError>().unwrap(),
+            DecodeError("Not enough data to decode filename length".to_string())
         );
     }
 
@@ -79,10 +77,8 @@ mod tests {
         let decoder = create_decoder(&buffer, bits_per_channel);
         let decoded = decoder.decode();
         assert_eq!(
-            decoded,
-            Err(DecodeError(
-                "Not enough data to decode filename".to_string()
-            ))
+            decoded.unwrap_err().downcast::<DecodeError>().unwrap(),
+            DecodeError("Not enough data to decode filename".to_string())
         );
     }
 
@@ -102,10 +98,8 @@ mod tests {
         let decoder = create_decoder(&buffer, bits_per_channel);
         let decoded = decoder.decode();
         assert_eq!(
-            decoded,
-            Err(DecodeError(
-                "Not enough data to decode data length".to_string()
-            ))
+            decoded.unwrap_err().downcast::<DecodeError>().unwrap(),
+            DecodeError("Not enough data to decode data length".to_string())
         );
     }
 
@@ -143,8 +137,8 @@ mod tests {
         let decoder = create_decoder(&buffer, bits_per_channel);
         let decoded = decoder.decode();
         assert_eq!(
-            decoded,
-            Err(DecodeError("Not enough data to decode data".to_string()))
+            decoded.unwrap_err().downcast::<DecodeError>().unwrap(),
+            DecodeError("Not enough data to decode data".to_string())
         );
     }