fix last test

4 files changed, 7 insertions, 9 deletions

diff --git a/src/actions/agenda.rs b/src/actions/agenda.rs
index d83228b..9659017 100644
--- a/src/actions/agenda.rs
+++ b/src/actions/agenda.rs
@@ -4,7 +4,6 @@ use itertools::Itertools;
 use structopt::StructOpt;
 
 use crate::cursorfile;
-use crate::icalwrap::*;
 use crate::input;
 use crate::config::{Config,CalendarConfig};
 use crate::khevent::KhEvent;
@@ -193,6 +192,7 @@ mod integration {
   use crate::testutils::*;
   use crate::utils::stdioutils;
   use crate::config::Config;
+  use crate::icalwrap::IcalVCalendar;
 
   use chrono::{Local, TimeZone};
 
diff --git a/src/actions/index/bucketable.rs b/src/actions/index/bucketable.rs
index 6bde0d1..74abcab 100644
--- a/src/actions/index/bucketable.rs
+++ b/src/actions/index/bucketable.rs
@@ -150,12 +150,12 @@ mod tests {
     let path = PathBuf::from("test/path");
     let cal = IcalVCalendar::from_str(testdata::TEST_EVENT_RECUR, Some(&path)).unwrap();
 
-    //let event = cal.get_principal_khevent();
-    //let event_buckets = event.get_buckets().unwrap();
+    let event = cal.get_principal_khevent();
+    let event_buckets = event.get_buckets().unwrap();
     let cal_buckets = cal.get_buckets().unwrap();
-    //assert_eq!(event_buckets, cal_buckets);
-    //let mut cal_bucket_names = cal_buckets.keys().collect::<Vec<&String>>();
-    //cal_bucket_names.sort_unstable();
-    //assert_eq!(vec!("2018-W41", "2018-W42", "2018-W43", "2018-W44", "2018-W45", "2018-W46", "2018-W47", "2018-W48", "2018-W49", "2018-W50"), cal_bucket_names);
+    assert_eq!(event_buckets, cal_buckets);
+    let mut cal_bucket_names = cal_buckets.keys().collect::<Vec<&String>>();
+    cal_bucket_names.sort_unstable();
+    assert_eq!(vec!("2018-W41", "2018-W42", "2018-W43", "2018-W44", "2018-W45", "2018-W46", "2018-W47", "2018-W48", "2018-W49", "2018-W50"), cal_bucket_names);
   }
 }
diff --git a/src/icalwrap/icalvevent.rs b/src/icalwrap/icalvevent.rs
index 228ad9f..17aa263 100644
--- a/src/icalwrap/icalvevent.rs
+++ b/src/icalwrap/icalvevent.rs
@@ -6,7 +6,6 @@ use super::IcalTime;
 use super::IcalTimeZone;
 use super::IcalDuration;
 use crate::ical;
-use crate::khevent::KhEvent;
 
 pub struct IcalVEvent {
   ptr: *mut ical::icalcomponent,
diff --git a/src/input.rs b/src/input.rs
index 3625ad7..62ba75d 100644
--- a/src/input.rs
+++ b/src/input.rs
@@ -4,7 +4,6 @@ use crate::seqfile;
 use crate::cursorfile;
 use crate::khline::{KhLine,lines_to_khlines,khlines_to_events};
 use crate::utils::stdioutils;
-use crate::icalwrap::IcalVEvent;
 use crate::selectors::SelectFilters;
 use crate::khevent::KhEvent;