melib/test: move data files to data subdir

melib/src/smtp.rs

@@ -1266,7 +1266,7 @@ mod test {
         });
 
         let smtp_server_conf = get_smtp_conf();
-        let input_str = include_str!("../tests/test_sample_longmessage.eml");
+        let input_str = include_str!("../tests/data/test_sample_longmessage.eml");
         match crate::Envelope::from_bytes(input_str.as_bytes(), None) {
             Ok(_envelope) => {}
             Err(err) => {

melib/tests/generating_email.rs

@@ -27,7 +27,7 @@ use melib::email::Draft;
 #[test]
 fn test_build_draft() {
     let mut new_draft = Draft::default();
-    let attachment = melib::email::attachment_from_file(&"./tests/test_image.gif")
+    let attachment = melib::email::attachment_from_file(&"./tests/data/test_image.gif")
         .expect("Could not open test_image.gif.");
     new_draft.headers_mut().remove("User-Agent");
     new_draft.headers_mut().remove("Date");
@@ -42,7 +42,7 @@ fn test_build_draft() {
 
     let raw = raw.replace(boundary_str, "");
 
-    let mut gz = GzDecoder::new(include_bytes!("generated_email.eml.gz").as_slice());
+    let mut gz = GzDecoder::new(include_bytes!("./data/generated_email.eml.gz").as_slice());
     let mut s = String::new();
     gz.read_to_string(&mut s).unwrap();
 

melib/tests/mbox_parse.rs

@@ -39,9 +39,9 @@ fn test_mbox_parse() {
 
     {
         let sha1dc_diet_op =
-            gz_to_string(include_bytes!("PATCH-Put-sha1dc-on-a-diet_op.mbox.gz").as_slice());
+            gz_to_string(include_bytes!("./data/PATCH-Put-sha1dc-on-a-diet_op.mbox.gz").as_slice());
         let sha1dc_diet_thread =
-            gz_to_string(include_bytes!("PATCH-Put-sha1dc-on-a-diet.mbox.gz").as_slice());
+            gz_to_string(include_bytes!("./data/PATCH-Put-sha1dc-on-a-diet.mbox.gz").as_slice());
 
         let message_iter = MessageIterator {
             index: Arc::new(Mutex::new(HashMap::default())),
@@ -70,10 +70,11 @@ fn test_mbox_parse() {
 
     {
         let git_am_op = gz_to_string(
-            include_bytes!("git-am-breakage-with-MIME-decoding_op.mbox.gz").as_slice(),
+            include_bytes!("./data/git-am-breakage-with-MIME-decoding_op.mbox.gz").as_slice(),
+        );
+        let git_am_thread = gz_to_string(
+            include_bytes!("./data/git-am-breakage-with-MIME-decoding.mbox.gz").as_slice(),
         );
-        let git_am_thread =
-            gz_to_string(include_bytes!("git-am-breakage-with-MIME-decoding.mbox.gz").as_slice());
 
         let message_iter = MessageIterator {
             index: Arc::new(Mutex::new(HashMap::default())),