More test changes

tests/tests.rs

@@ -1,5 +1,4 @@
 mod song_tests {
-    // use std::fs::{self, File};
     use std::fs;
     use std::fs::File;
     use std::io::{Read, Write};
@@ -30,12 +29,7 @@ mod song_tests {
                 let _ = file.read_to_end(&mut buffer);
                 Ok(buffer)
             }
-            Err(err) => {
-                println!("Error: {}", err);
-                // assert!(false, "Failed to open file: {:?}", err);
-                // Err(4)
-                Err(err)
-            }
+            Err(err) => Err(err),
         }
     }
 
@@ -49,22 +43,9 @@ mod song_tests {
 
         println!("Getting track");
         let mut song = song::Song::default();
-        song.filename = String::from("track01.flac");
-        song.id = 1;
-        // println!("O ", song.id);
-
-        // let temp_dir = tempdir().expect("Failed to create temp dir");
-
-        println!("Getting directory");
-        /*
-        song.directory = match temp_dir.path().to_str() {
-            Some(s) => String::from(s),
-            None => { String::new() },
-        };
-        */
         song.directory = get_tests_directory();
+        song.filename = String::from("track01.flac");
 
-        // assert_eq!(song.directory.is_empty(), false);
         assert!(
             does_directory_exists(&song.directory),
             "Directory does not exist"
@@ -73,33 +54,25 @@ mod song_tests {
         println!("Directory: {}", song.directory);
 
         match song.song_path() {
-            Ok(filepath) => {
-                // let file_result = std::fs::File::open(filepath);
-                // match file_result {
-                match extract_data_from_file(&filepath) {
-                    Ok(buffer) => {
-                        // let mut buffer: Vec<u8> = Vec::new();
-                        // let _ = file.read_to_end(&mut buffer);
-                        assert_eq!(buffer.is_empty(), false);
+            Ok(filepath) => match extract_data_from_file(&filepath) {
+                Ok(buffer) => {
+                    assert_eq!(buffer.is_empty(), false);
 
-                        match song.to_data() {
-                            Ok(song_data) => {
-                                println!("Both files match");
-                                assert_eq!(buffer, song_data);
-                            }
-                            Err(err) => {
-                                assert!(false, "Error producing song data: {:?}", err);
-                            }
-                        };
-                    }
-                    Err(err) => {
-                        println!("Error: {}", err);
-                        assert!(false, "Failed to open file: {:?}", err);
-                    }
+                    match song.to_data() {
+                        Ok(song_data) => {
+                            println!("Both files match");
+                            assert_eq!(buffer, song_data);
+                        }
+                        Err(err) => {
+                            assert!(false, "Error producing song data: {:?}", err);
+                        }
+                    };
                 }
-            }
+                Err(err) => {
+                    assert!(false, "Failed to open file: {:?}", err);
+                }
+            },
             Err(err) => {
-                println!("Error: {}", err);
                 assert!(false, "Could not get song path: {:?}", err);
             }
         }
@@ -134,7 +107,6 @@ mod song_tests {
                     };
 
                     assert_eq!(song.directory.is_empty(), false);
-                    // song_cpy.directory = String::from(temp_dir.path().to_str());
                     song_cpy.filename =
                         song.generate_filename(types::MusicTypes::FlacExtension, true);
                     println!("Directory: {:?}", song_cpy.directory);
@@ -149,9 +121,14 @@ mod song_tests {
                     };
 
                     match File::create(path) {
-                        Ok(mut file_cpy) => {
-                            let _ = file_cpy.write_all(&buffer);
-                        }
+                        Ok(mut file_cpy) => match file_cpy.write_all(&buffer) {
+                            Ok(success) => {
+                                println!("Success: {:?}", success);
+                            }
+                            Err(err) => {
+                                assert!(false, "Error saving file: {:?}", err);
+                            }
+                        },
                         Err(err) => {
                             assert!(false, "Error: {:?}", err);
                         }