From 073d43b9b869fc9d46c5195c31ad6e7806cf486c Mon Sep 17 00:00:00 2001 From: Manos Pitsidianakis Date: Fri, 21 Jul 2023 18:12:39 +0300 Subject: [PATCH] melib/test: move data files to data subdir --- melib/src/smtp.rs | 2 +- .../{ => data}/PATCH-Put-sha1dc-on-a-diet.mbox.gz | Bin .../PATCH-Put-sha1dc-on-a-diet_op.mbox.gz | Bin melib/tests/{ => data}/generated_email.eml.gz | Bin .../git-am-breakage-with-MIME-decoding.mbox.gz | Bin .../git-am-breakage-with-MIME-decoding_op.mbox.gz | Bin melib/tests/{ => data}/test_image.gif | Bin melib/tests/{ => data}/test_sample_longmessage.eml | 0 melib/tests/generating_email.rs | 4 ++-- melib/tests/mbox_parse.rs | 11 ++++++----- 10 files changed, 9 insertions(+), 8 deletions(-) rename melib/tests/{ => data}/PATCH-Put-sha1dc-on-a-diet.mbox.gz (100%) rename melib/tests/{ => data}/PATCH-Put-sha1dc-on-a-diet_op.mbox.gz (100%) rename melib/tests/{ => data}/generated_email.eml.gz (100%) rename melib/tests/{ => data}/git-am-breakage-with-MIME-decoding.mbox.gz (100%) rename melib/tests/{ => data}/git-am-breakage-with-MIME-decoding_op.mbox.gz (100%) rename melib/tests/{ => data}/test_image.gif (100%) rename melib/tests/{ => data}/test_sample_longmessage.eml (100%) diff --git a/melib/src/smtp.rs b/melib/src/smtp.rs index 0b8fac84..c933f08e 100644 --- a/melib/src/smtp.rs +++ b/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) => { diff --git a/melib/tests/PATCH-Put-sha1dc-on-a-diet.mbox.gz b/melib/tests/data/PATCH-Put-sha1dc-on-a-diet.mbox.gz similarity index 100% rename from melib/tests/PATCH-Put-sha1dc-on-a-diet.mbox.gz rename to melib/tests/data/PATCH-Put-sha1dc-on-a-diet.mbox.gz diff --git a/melib/tests/PATCH-Put-sha1dc-on-a-diet_op.mbox.gz b/melib/tests/data/PATCH-Put-sha1dc-on-a-diet_op.mbox.gz similarity index 100% rename from melib/tests/PATCH-Put-sha1dc-on-a-diet_op.mbox.gz rename to melib/tests/data/PATCH-Put-sha1dc-on-a-diet_op.mbox.gz diff --git a/melib/tests/generated_email.eml.gz b/melib/tests/data/generated_email.eml.gz similarity index 100% rename from melib/tests/generated_email.eml.gz rename to melib/tests/data/generated_email.eml.gz diff --git a/melib/tests/git-am-breakage-with-MIME-decoding.mbox.gz b/melib/tests/data/git-am-breakage-with-MIME-decoding.mbox.gz similarity index 100% rename from melib/tests/git-am-breakage-with-MIME-decoding.mbox.gz rename to melib/tests/data/git-am-breakage-with-MIME-decoding.mbox.gz diff --git a/melib/tests/git-am-breakage-with-MIME-decoding_op.mbox.gz b/melib/tests/data/git-am-breakage-with-MIME-decoding_op.mbox.gz similarity index 100% rename from melib/tests/git-am-breakage-with-MIME-decoding_op.mbox.gz rename to melib/tests/data/git-am-breakage-with-MIME-decoding_op.mbox.gz diff --git a/melib/tests/test_image.gif b/melib/tests/data/test_image.gif similarity index 100% rename from melib/tests/test_image.gif rename to melib/tests/data/test_image.gif diff --git a/melib/tests/test_sample_longmessage.eml b/melib/tests/data/test_sample_longmessage.eml similarity index 100% rename from melib/tests/test_sample_longmessage.eml rename to melib/tests/data/test_sample_longmessage.eml diff --git a/melib/tests/generating_email.rs b/melib/tests/generating_email.rs index 23fabd44..3ff7326d 100644 --- a/melib/tests/generating_email.rs +++ b/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(); diff --git a/melib/tests/mbox_parse.rs b/melib/tests/mbox_parse.rs index be7de053..f16829ff 100644 --- a/melib/tests/mbox_parse.rs +++ b/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())),