From 931d74f57703c1bb9c1a62eea9f8af06e9cc8675 Mon Sep 17 00:00:00 2001
From: daladim <daladim@users.noreply.github.com>
Date: Wed, 31 Mar 2021 08:40:21 +0200
Subject: [PATCH] [minor] Tests

---
 tests/caldav_client.rs | 27 +++++++++++++--------------
 tests/sync.rs          | 11 +++++++++--
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/tests/caldav_client.rs b/tests/caldav_client.rs
index 1701321..ef6f21b 100644
--- a/tests/caldav_client.rs
+++ b/tests/caldav_client.rs
@@ -7,8 +7,6 @@ use minidom::Element;
 use url::Url;
 
 use my_tasks::client::Client;
-use my_tasks::traits::BaseCalendar;
-use my_tasks::traits::DavCalendar;
 use my_tasks::traits::CalDavSource;
 
 use my_tasks::settings::URL;
@@ -16,6 +14,9 @@ use my_tasks::settings::USERNAME;
 use my_tasks::settings::PASSWORD;
 use my_tasks::settings::EXAMPLE_TASK_URL;
 use my_tasks::settings::EXAMPLE_CALENDAR_URL;
+use my_tasks::ItemId;
+use my_tasks::traits::DavCalendar;
+
 
 static EXAMPLE_TASKS_BODY_LAST_MODIFIED: &str = r#"
 <C:calendar-query xmlns:D="DAV:"
@@ -45,19 +46,8 @@ async fn show_calendars() {
     let calendars = client.get_calendars().await.unwrap();
 
     println!("Calendars:");
-    for (id, calendar) in calendars.iter() {
-        let cal = calendar.lock().unwrap();
-        println!("  {}\t{}", cal.name(), id.as_str());
-        println!("  IDs:");
-        for id in cal.get_item_ids().await.unwrap() {
-            println!("  * {}", id);
-        }
+    my_tasks::utils::print_dav_calendar_list(&calendars).await;
 
-        println!("  Most recent changes:");
-        // for (_id, task) in cal.get_item_version_tags(None, None).await.unwrap() {
-        //     my_tasks::utils::print_task(task);
-        // }
-    }
 }
 
 #[tokio::test]
@@ -104,3 +94,12 @@ async fn last_modified() {
     let el: Element = res.text().await.unwrap().parse().unwrap();
     my_tasks::utils::print_xml(&el);
 }
+
+
+
+
+//
+//
+// TODO: test w/ wrong creds
+// TODO: test withou connection
+//
diff --git a/tests/sync.rs b/tests/sync.rs
index eddfad6..b7fa3cc 100644
--- a/tests/sync.rs
+++ b/tests/sync.rs
@@ -24,14 +24,21 @@ async fn test_regular_sync() {
     let _ = env_logger::builder().is_test(true).try_init();
 
     let mut provider = populate_test_provider().await;
+    let cals_server = provider.remote().get_calendars().await.unwrap();
+    println!("----Server, before sync-------");
+    my_tasks::utils::print_calendar_list(&cals_server).await;
+    let cals_local = provider.local().get_calendars().await.unwrap();
+    println!("\n----Local, before sync-------");
+    my_tasks::utils::print_calendar_list(&cals_local).await;
+
     provider.sync().await.unwrap();
 
 
     let cals_server = provider.remote().get_calendars().await.unwrap();
-    println!("----Server-------");
+    println!("----Server, after sync-------");
     my_tasks::utils::print_calendar_list(&cals_server).await;
     let cals_local = provider.local().get_calendars().await.unwrap();
-    println!("\n----Local-------");
+    println!("\n----Local, after sync-------");
     my_tasks::utils::print_calendar_list(&cals_local).await;
 
     assert!(provider.remote().has_same_contents_than(provider.local()).await.unwrap());