diff options
author | Nora <nora.widdecke@tu-bs.de> | 2019-01-09 13:49:22 +0100 |
---|---|---|
committer | Nora <nora.widdecke@tu-bs.de> | 2019-01-09 17:06:12 +0100 |
commit | 7693fb46e679cb02f4996727c508336d3b201c40 (patch) | |
tree | ca959c52310c73c16f5052c578f857ae1b0417d1 | |
parent | 58a405c7e4dfb4223406570692057c408eabe48e (diff) |
testdata: add multiday event with times, rename previous multiday event
-rw-r--r-- | src/agenda.rs | 6 | ||||
-rw-r--r-- | src/bucketable.rs | 2 | ||||
-rw-r--r-- | src/icalwrap/icalvcalendar.rs | 2 | ||||
-rw-r--r-- | src/icalwrap/icalvevent.rs | 4 | ||||
-rw-r--r-- | src/testdata.rs | 18 |
5 files changed, 24 insertions, 8 deletions
diff --git a/src/agenda.rs b/src/agenda.rs index 66a66a2..eec2f0b 100644 --- a/src/agenda.rs +++ b/src/agenda.rs @@ -165,7 +165,7 @@ mod tests { #[test] fn test_continues_after_allday() { - let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY, None).unwrap(); + let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY_ALLDAY, None).unwrap(); let event = cal.get_principal_event(); let first_day = Local.ymd(2007, 6, 28); assert!(event.continues_after(first_day)); @@ -201,8 +201,8 @@ mod tests { } #[test] - fn test_event_line_multiday() { - let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY, None).unwrap(); + fn test_event_line_multiday_allday() { + let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY_ALLDAY, None).unwrap(); let event = cal.get_principal_event(); let date = Local.ymd(2007, 6, 28); let event_line = event_line(None, &event, date).unwrap(); diff --git a/src/bucketable.rs b/src/bucketable.rs index 53529f4..1d04ce2 100644 --- a/src/bucketable.rs +++ b/src/bucketable.rs @@ -105,7 +105,7 @@ fn buckets_multi_day_allday() { use std::path::PathBuf; let path = Some(PathBuf::from("test/path")); - let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY, path).unwrap(); + let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY_ALLDAY, path).unwrap(); let event_buckets = cal.get_principal_event().get_buckets().unwrap(); diff --git a/src/icalwrap/icalvcalendar.rs b/src/icalwrap/icalvcalendar.rs index aa9d8a0..ed80add 100644 --- a/src/icalwrap/icalvcalendar.rs +++ b/src/icalwrap/icalvcalendar.rs @@ -320,7 +320,7 @@ mod tests { #[test] fn get_khaleesi_line_test() { let path = Some(PathBuf::from("test/path")); - let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY, path).unwrap(); + let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY_ALLDAY, path).unwrap(); let event = cal.get_principal_event(); assert_eq!(String::from("1182988800 test/path"), event.get_khaleesi_line().unwrap()) } diff --git a/src/icalwrap/icalvevent.rs b/src/icalwrap/icalvevent.rs index 455e944..590b107 100644 --- a/src/icalwrap/icalvevent.rs +++ b/src/icalwrap/icalvevent.rs @@ -237,7 +237,7 @@ mod tests { #[test] fn test_get_property_get_value() { - let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY, None).unwrap(); + let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY_ALLDAY, None).unwrap(); let event = cal.get_principal_event(); let prop = event.get_properties_by_name("DTSTART"); @@ -249,7 +249,7 @@ mod tests { #[test] fn test_get_property_debug() { - let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY, None).unwrap(); + let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_MULTIDAY_ALLDAY, None).unwrap(); let event = cal.get_principal_event(); let prop = event.get_properties_by_name("DTSTART"); diff --git a/src/testdata.rs b/src/testdata.rs index f649d60..5463047 100644 --- a/src/testdata.rs +++ b/src/testdata.rs @@ -1,5 +1,5 @@ // from https://tools.ietf.org/html/rfc5545#section-3.6.1 -pub static TEST_EVENT_MULTIDAY: &str = indoc!(" +pub static TEST_EVENT_MULTIDAY_ALLDAY: &str = indoc!(" BEGIN:VCALENDAR VERSION:2.0 PRODID:-//ABC Corporation//NONSGML My Product//EN @@ -15,6 +15,22 @@ pub static TEST_EVENT_MULTIDAY: &str = indoc!(" END:VCALENDAR "); +pub static TEST_EVENT_MULTIDAY: &str = indoc!(" + BEGIN:VCALENDAR + VERSION:2.0 + PRODID:-//ABC Corporation//NONSGML My Product//EN + BEGIN:VEVENT + UID:20070423T123432Z-541111@example.com + DTSTAMP:20070423T123432Z + DTSTART;VALUE=DATE:20070628T132900 + DTEND;VALUE=DATE:20070709T072900 + SUMMARY:Festival International de Jazz de Montreal + LOCATION:LDB Lobby + TRANSP:TRANSPARENT + END:VEVENT + END:VCALENDAR +"); + pub static TEST_EVENT_EMPTY_SUMMARY: &str = indoc!(" BEGIN:VCALENDAR VERSION:2.0 |