diff options
author | Matthias Beyer <mail@beyermatthias.de> | 2019-12-20 12:29:51 +0100 |
---|---|---|
committer | Matthias Beyer <mail@beyermatthias.de> | 2019-12-20 12:29:51 +0100 |
commit | 0be8a499fa29e860e984cad61a721be9ad28026e (patch) | |
tree | 25d8e9de01f269f3e7039b8c1bdcaf4ec57545bb | |
parent | 4e065267398aaedcf827a3a26f11b0cba8d9bb19 (diff) |
Move code for testing to submodule
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
-rw-r--r-- | src/component.rs | 12 | ||||
-rw-r--r-- | src/lib.rs | 5 | ||||
-rw-r--r-- | src/testing/data.rs (renamed from src/testdata.rs) | 0 | ||||
-rw-r--r-- | src/testing/mod.rs | 2 | ||||
-rw-r--r-- | src/testing/utils.rs (renamed from src/testutils.rs) | 0 | ||||
-rw-r--r-- | src/utils/dateutil.rs | 3 | ||||
-rw-r--r-- | src/vcalendar.rs | 48 | ||||
-rw-r--r-- | src/vevent.rs | 40 |
8 files changed, 54 insertions, 56 deletions
diff --git a/src/component.rs b/src/component.rs index 7de364c..d6e38b8 100644 --- a/src/component.rs +++ b/src/component.rs @@ -87,12 +87,12 @@ pub trait IcalComponent { #[cfg(test)] mod tests { use super::*; - use crate::testdata; + use crate::testing; use crate::IcalVCalendar; #[test] fn get_property_test() { - let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY, None).unwrap(); + let cal = IcalVCalendar::from_str(testing::data::TEST_EVENT_MULTIDAY, None).unwrap(); let event = cal.get_principal_event(); let prop_name = "SUMMARY"; let prop_value: String = event.get_property_by_name(prop_name).unwrap().get_value(); @@ -106,7 +106,7 @@ mod tests { #[test] fn get_property_test_lastmodified() { let cal = - IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY_LASTMODIFIED, None).unwrap(); + IcalVCalendar::from_str(testing::data::TEST_EVENT_MULTIDAY_LASTMODIFIED, None).unwrap(); let event = cal.get_principal_event(); let prop_name = "LAST-MODIFIED"; let prop_value: String = event.get_property_by_name(prop_name).unwrap().get_value(); @@ -116,7 +116,7 @@ mod tests { #[test] fn get_property_test_cal() { - let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY, None).unwrap(); + let cal = IcalVCalendar::from_str(testing::data::TEST_EVENT_MULTIDAY, None).unwrap(); let prop_name = "PRODID"; let prop_value: String = cal.get_property_by_name(prop_name).unwrap().get_value(); @@ -128,7 +128,7 @@ mod tests { #[test] fn get_property_test_negative() { - let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY, None).unwrap(); + let cal = IcalVCalendar::from_str(testing::data::TEST_EVENT_MULTIDAY, None).unwrap(); let event = cal.get_principal_event(); let prop_name = "DESCRIPTION"; let prop = event.get_property_by_name(prop_name); @@ -138,7 +138,7 @@ mod tests { #[test] fn get_property_by_name_test() { - let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY, None).unwrap(); + let cal = IcalVCalendar::from_str(testing::data::TEST_EVENT_MULTIDAY, None).unwrap(); let event = cal.get_principal_event(); let prop_name = "NONSENSE"; let prop = event.get_property_by_name(prop_name); @@ -43,10 +43,7 @@ pub mod vcalendar; pub mod vevent; #[cfg(test)] -pub mod testdata; - -#[cfg(test)] -pub mod testutils; +pub mod testing; pub use crate::component::IcalComponent; pub use crate::duration::IcalDuration; diff --git a/src/testdata.rs b/src/testing/data.rs index 9237889..9237889 100644 --- a/src/testdata.rs +++ b/src/testing/data.rs diff --git a/src/testing/mod.rs b/src/testing/mod.rs new file mode 100644 index 0000000..6a768c5 --- /dev/null +++ b/src/testing/mod.rs @@ -0,0 +1,2 @@ +pub mod utils; +pub mod data; diff --git a/src/testutils.rs b/src/testing/utils.rs index ade3ea1..ade3ea1 100644 --- a/src/testutils.rs +++ b/src/testing/utils.rs diff --git a/src/utils/dateutil.rs b/src/utils/dateutil.rs index 0f17971..003b837 100644 --- a/src/utils/dateutil.rs +++ b/src/utils/dateutil.rs @@ -56,8 +56,7 @@ pub fn now() -> DateTime<Utc> { #[cfg(test)] pub fn now() -> DateTime<Utc> { - use crate::testdata; - *testdata::NOW_TEST + *crate::testing::data::NOW_TEST } pub fn week_from_str_end(date_str: &str) -> Result<Date<Local>, String> { diff --git a/src/vcalendar.rs b/src/vcalendar.rs index 09752d5..845831d 100644 --- a/src/vcalendar.rs +++ b/src/vcalendar.rs @@ -406,7 +406,7 @@ impl Drop for IcalComponentOwner { #[cfg(test)] mod tests { use super::*; - use crate::testdata; + use crate::testing; #[test] fn test_from_str_empty() { @@ -415,39 +415,39 @@ mod tests { #[test] fn test_from_str_event() { - assert!(IcalVCalendar::from_str(testdata::TEST_BARE_EVENT, None).is_err()); + assert!(IcalVCalendar::from_str(testing::data::TEST_BARE_EVENT, None).is_err()); } #[test] fn event_iterator_element_count() { - let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY, None).unwrap(); + let cal = IcalVCalendar::from_str(testing::data::TEST_EVENT_MULTIDAY, None).unwrap(); assert_eq!(cal.events_iter().count(), 1) } #[test] fn event_iterator_element_count_with_other() { let cal = - IcalVCalendar::from_str(testdata::TEST_EVENT_WITH_TIMEZONE_COMPONENT, None).unwrap(); + IcalVCalendar::from_str(testing::data::TEST_EVENT_WITH_TIMEZONE_COMPONENT, None).unwrap(); assert_eq!(cal.events_iter().count(), 1) } #[test] fn load_serialize() { - let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY, None).unwrap(); + let cal = IcalVCalendar::from_str(testing::data::TEST_EVENT_MULTIDAY, None).unwrap(); let back = cal.to_string().replace("\r\n", "\n"); - assert_eq!(back.trim(), testdata::TEST_EVENT_MULTIDAY) + assert_eq!(back.trim(), testing::data::TEST_EVENT_MULTIDAY) } #[test] fn load_serialize_with_error() { - let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_WITH_X_LIC_ERROR, None).unwrap(); + let cal = IcalVCalendar::from_str(testing::data::TEST_EVENT_WITH_X_LIC_ERROR, None).unwrap(); let back = cal.to_string().replace("\r\n", "\n"); - assert_eq!(back.trim(), testdata::TEST_EVENT_WITH_X_LIC_ERROR) + assert_eq!(back.trim(), testing::data::TEST_EVENT_WITH_X_LIC_ERROR) } #[test] fn with_dtstamp_test() { - let mut cal = IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY, None).unwrap(); + let mut cal = IcalVCalendar::from_str(testing::data::TEST_EVENT_MULTIDAY, None).unwrap(); cal = cal.with_dtstamp_now(); let event = cal.get_principal_event(); @@ -460,13 +460,13 @@ mod tests { fn get_calendar_name_test() { let path = PathBuf::from("calname/event"); let cal = - IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY_ALLDAY, Some(&path)).unwrap(); + IcalVCalendar::from_str(testing::data::TEST_EVENT_MULTIDAY_ALLDAY, Some(&path)).unwrap(); assert_eq!("calname".to_string(), cal.get_calendar_name().unwrap()) } #[test] fn test_get_all_properties_cal() { - let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY, None).unwrap(); + let cal = IcalVCalendar::from_str(testing::data::TEST_EVENT_MULTIDAY, None).unwrap(); let props = cal.get_properties_all(); assert_eq!(2, props.len()); @@ -474,7 +474,7 @@ mod tests { #[test] fn parse_checker_test_empty_summary() { - let c_str = CString::new(testdata::TEST_EVENT_EMPTY_SUMMARY).unwrap(); + let c_str = CString::new(testing::data::TEST_EVENT_EMPTY_SUMMARY).unwrap(); unsafe { let parsed_cal = ical::icalparser_parse_string(c_str.as_ptr()); assert!(IcalVCalendar::check_icalcomponent(parsed_cal).is_some()) @@ -483,7 +483,7 @@ mod tests { #[test] fn parse_checker_test_no_uid() { - let c_str = CString::new(testdata::TEST_EVENT_NO_UID).unwrap(); + let c_str = CString::new(testing::data::TEST_EVENT_NO_UID).unwrap(); unsafe { let parsed_cal = ical::icalparser_parse_string(c_str.as_ptr()); assert!(IcalVCalendar::check_icalcomponent(parsed_cal).is_some()) @@ -492,7 +492,7 @@ mod tests { #[test] fn parse_checker_test_no_prodid() { - let c_str = CString::new(testdata::TEST_EVENT_NO_PRODID).unwrap(); + let c_str = CString::new(testing::data::TEST_EVENT_NO_PRODID).unwrap(); unsafe { let parsed_cal = ical::icalparser_parse_string(c_str.as_ptr()); assert!(IcalVCalendar::check_icalcomponent(parsed_cal).is_some()) @@ -502,7 +502,7 @@ mod tests { #[test] fn test_with_last_modified_now() { let cal = - IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY_LASTMODIFIED, None).unwrap(); + IcalVCalendar::from_str(testing::data::TEST_EVENT_MULTIDAY_LASTMODIFIED, None).unwrap(); let new_cal = cal.with_last_modified_now(); let event = new_cal.get_principal_event(); @@ -516,7 +516,7 @@ mod tests { #[test] fn test_with_last_modified_now_added() { - let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY, None).unwrap(); + let cal = IcalVCalendar::from_str(testing::data::TEST_EVENT_MULTIDAY, None).unwrap(); let new_cal = cal.with_last_modified_now(); let event = new_cal.get_principal_event(); @@ -530,7 +530,7 @@ mod tests { #[test] fn test_with_location() { - let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY, None).unwrap(); + let cal = IcalVCalendar::from_str(testing::data::TEST_EVENT_MULTIDAY, None).unwrap(); let location = "test"; let new_cal = cal.with_location(location); @@ -541,7 +541,7 @@ mod tests { //#[test] //fn test_with_internal_timestamp() { - //let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY, None).unwrap(); + //let cal = IcalVCalendar::from_str(testing::data::TEST_EVENT_MULTIDAY, None).unwrap(); // //let timestamp = IcalTime::floating_ymd(2018, 1, 1).and_hms(11, 30, 20); //let new_cal = cal.with_internal_timestamp(×tamp); @@ -553,7 +553,7 @@ mod tests { #[test] fn with_uid_test() { let path = PathBuf::from("test/path"); - let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY, Some(&path)).unwrap(); + let cal = IcalVCalendar::from_str(testing::data::TEST_EVENT_MULTIDAY, Some(&path)).unwrap(); let uid = "my_new_uid"; let new_cal = cal.with_uid(uid).unwrap(); @@ -570,7 +570,7 @@ mod tests { #[test] fn with_uid_multiple_test() { let path = PathBuf::from("test/path"); - let cal = IcalVCalendar::from_str(testdata::TEST_MULTIPLE_EVENTS, Some(&path)).unwrap(); + let cal = IcalVCalendar::from_str(testing::data::TEST_MULTIPLE_EVENTS, Some(&path)).unwrap(); let uid = "my_new_uid"; let new_cal = cal.with_uid(uid); @@ -581,7 +581,7 @@ mod tests { #[test] fn with_keep_uid_test() { let path = PathBuf::from("test/path"); - let cal = IcalVCalendar::from_str(testdata::TEST_MULTIPLE_EVENTS, Some(&path)).unwrap(); + let cal = IcalVCalendar::from_str(testing::data::TEST_MULTIPLE_EVENTS, Some(&path)).unwrap(); for uid in &["uid1", "uid2"] { let new_cal = cal.clone().with_keep_uid(uid); @@ -595,7 +595,7 @@ mod tests { #[test] fn clone_test() { let path = PathBuf::from("test/path"); - let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY, Some(&path)).unwrap(); + let cal = IcalVCalendar::from_str(testing::data::TEST_EVENT_MULTIDAY, Some(&path)).unwrap(); let cal2 = cal.clone().with_uid("my_new_uid").unwrap(); assert_ne!(cal.get_uid(), cal2.get_uid()); @@ -603,7 +603,7 @@ mod tests { #[test] fn parse_checker_test_negative() { - let c_str = CString::new(testdata::TEST_EVENT_NO_PRODID).unwrap(); + let c_str = CString::new(testing::data::TEST_EVENT_NO_PRODID).unwrap(); unsafe { let parsed_cal = ical::icalparser_parse_string(c_str.as_ptr()); assert!(IcalVCalendar::check_icalcomponent(parsed_cal).is_some()) @@ -612,7 +612,7 @@ mod tests { #[test] fn parse_checker_test() { - let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY, None).unwrap(); + let cal = IcalVCalendar::from_str(testing::data::TEST_EVENT_MULTIDAY, None).unwrap(); assert!(cal.check_for_errors().is_none()); } } diff --git a/src/vevent.rs b/src/vevent.rs index 97d4bcc..d8b345f 100644 --- a/src/vevent.rs +++ b/src/vevent.rs @@ -205,12 +205,12 @@ extern "C" fn recur_callback( #[cfg(test)] mod tests { use super::*; - use crate::testdata; + use crate::testing; use chrono::NaiveDate; #[test] fn test_get_all_properties() { - let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY, None).unwrap(); + let cal = IcalVCalendar::from_str(testing::data::TEST_EVENT_MULTIDAY, None).unwrap(); let event = cal.get_principal_event(); let props = event.get_properties_all(); @@ -219,7 +219,7 @@ mod tests { #[test] fn test_get_property_get_value() { - let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY_ALLDAY, None).unwrap(); + let cal = IcalVCalendar::from_str(testing::data::TEST_EVENT_MULTIDAY_ALLDAY, None).unwrap(); let event = cal.get_principal_event(); let prop = event.get_properties_by_name("DTSTART"); @@ -234,7 +234,7 @@ mod tests { #[test] fn test_get_property_debug() { - let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY_ALLDAY, None).unwrap(); + let cal = IcalVCalendar::from_str(testing::data::TEST_EVENT_MULTIDAY_ALLDAY, None).unwrap(); let event = cal.get_principal_event(); let prop = event .get_property(ical::icalproperty_kind_ICAL_DTSTART_PROPERTY) @@ -245,7 +245,7 @@ mod tests { #[test] fn test_get_summary() { - let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY, None).unwrap(); + let cal = IcalVCalendar::from_str(testing::data::TEST_EVENT_MULTIDAY, None).unwrap(); let event = cal.get_principal_event(); assert_eq!( @@ -256,7 +256,7 @@ mod tests { #[test] fn test_get_summary_none() { - let cal = IcalVCalendar::from_str(testdata::TEST_NO_SUMMARY, None).unwrap(); + let cal = IcalVCalendar::from_str(testing::data::TEST_NO_SUMMARY, None).unwrap(); let event = cal.get_principal_event(); assert_eq!(None, event.get_summary()); @@ -264,7 +264,7 @@ mod tests { #[test] fn test_get_dtstart() { - let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY, None).unwrap(); + let cal = IcalVCalendar::from_str(testing::data::TEST_EVENT_MULTIDAY, None).unwrap(); let event = cal.get_principal_event(); assert_eq!( @@ -275,7 +275,7 @@ mod tests { #[test] fn test_get_dtstart_negative() { - let cal = IcalVCalendar::from_str(testdata::TEST_NO_DTSTART, None).unwrap(); + let cal = IcalVCalendar::from_str(testing::data::TEST_NO_DTSTART, None).unwrap(); let event = cal.get_principal_event(); assert!(event.get_dtstart().is_none()); @@ -283,7 +283,7 @@ mod tests { #[test] fn test_get_dtend() { - let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY, None).unwrap(); + let cal = IcalVCalendar::from_str(testing::data::TEST_EVENT_MULTIDAY, None).unwrap(); let event = cal.get_principal_event(); assert_eq!( @@ -294,7 +294,7 @@ mod tests { #[test] fn test_get_dtend_negative() { - let cal = IcalVCalendar::from_str(testdata::TEST_NO_DTSTART, None).unwrap(); + let cal = IcalVCalendar::from_str(testing::data::TEST_NO_DTSTART, None).unwrap(); let event = cal.get_principal_event(); assert!(event.get_dtend().is_none()); @@ -302,7 +302,7 @@ mod tests { #[test] fn test_get_duration_internal_normal() { - let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY, None).unwrap(); + let cal = IcalVCalendar::from_str(testing::data::TEST_EVENT_MULTIDAY, None).unwrap(); let event = cal.get_principal_event(); assert_eq!( @@ -313,7 +313,7 @@ mod tests { #[test] fn test_get_duration_normal() { - let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY, None).unwrap(); + let cal = IcalVCalendar::from_str(testing::data::TEST_EVENT_MULTIDAY, None).unwrap(); let event = cal.get_principal_event(); assert_eq!( @@ -324,7 +324,7 @@ mod tests { #[test] fn test_get_duration_inernal_startdate_only() { - let cal = IcalVCalendar::from_str(testdata::TEST_DTSTART_ONLY_DATE, None).unwrap(); + let cal = IcalVCalendar::from_str(testing::data::TEST_DTSTART_ONLY_DATE, None).unwrap(); let event = cal.get_principal_event(); assert!(event.get_duration_internal().is_none()); @@ -332,7 +332,7 @@ mod tests { #[test] fn test_get_duration_startdate_only() { - let cal = IcalVCalendar::from_str(testdata::TEST_DTSTART_ONLY_DATE, None).unwrap(); + let cal = IcalVCalendar::from_str(testing::data::TEST_DTSTART_ONLY_DATE, None).unwrap(); let event = cal.get_principal_event(); assert_eq!( @@ -343,7 +343,7 @@ mod tests { #[test] fn test_get_duration_internal_startdatetime_only() { - let cal = IcalVCalendar::from_str(testdata::TEST_DTSTART_ONLY_DATETIME, None).unwrap(); + let cal = IcalVCalendar::from_str(testing::data::TEST_DTSTART_ONLY_DATETIME, None).unwrap(); let event = cal.get_principal_event(); assert!(event.get_duration_internal().is_none()); @@ -351,7 +351,7 @@ mod tests { #[test] fn test_get_duration_startdatetime_only() { - let cal = IcalVCalendar::from_str(testdata::TEST_DTSTART_ONLY_DATETIME, None).unwrap(); + let cal = IcalVCalendar::from_str(testing::data::TEST_DTSTART_ONLY_DATETIME, None).unwrap(); let event = cal.get_principal_event(); assert_eq!(Some(IcalDuration::from_seconds(0)), event.get_duration()); @@ -359,7 +359,7 @@ mod tests { #[test] fn test_get_description() { - let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_ONE_MEETING, None).unwrap(); + let cal = IcalVCalendar::from_str(testing::data::TEST_EVENT_ONE_MEETING, None).unwrap(); let event = cal.get_principal_event(); assert_eq!( @@ -373,7 +373,7 @@ mod tests { #[test] fn test_get_description_none() { - let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY, None).unwrap(); + let cal = IcalVCalendar::from_str(testing::data::TEST_EVENT_MULTIDAY, None).unwrap(); let event = cal.get_principal_event(); assert_eq!(None, event.get_description()); @@ -381,7 +381,7 @@ mod tests { #[test] fn test_get_location() { - let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_ONE_MEETING, None).unwrap(); + let cal = IcalVCalendar::from_str(testing::data::TEST_EVENT_ONE_MEETING, None).unwrap(); let event = cal.get_principal_event(); assert_eq!(Some("LDB Lobby".to_string()), event.get_location()); @@ -389,7 +389,7 @@ mod tests { #[test] fn test_get_location_none() { - let cal = IcalVCalendar::from_str(testdata::TEST_NO_SUMMARY, None).unwrap(); + let cal = IcalVCalendar::from_str(testing::data::TEST_NO_SUMMARY, None).unwrap(); let event = cal.get_principal_event(); assert_eq!(None, event.get_location()); |