2 files changed, 17 insertions, 20 deletions

diff --git a/tests/teststore.cpp b/tests/teststore.cpp
index 902014cd..3a60676d 100644
--- a/tests/teststore.cpp
+++ b/tests/teststore.cpp
@@ -138,36 +138,30 @@ static void createEvent(const QVariantMap &object, const QByteArray &calendarId
 
     auto calcoreEvent = QSharedPointer<KCalCore::Event>::create();
 
+    QString uid;
     if (object.contains("uid")) {
-        auto uid = object["uid"].toString();
-        sinkEvent.setUid(uid);
-        calcoreEvent->setUid(uid);
+        uid = object["uid"].toString();
     } else {
-        auto uid = QUuid::createUuid().toString();
-        sinkEvent.setUid(uid);
-        calcoreEvent->setUid(uid);
+        uid = QUuid::createUuid().toString();
     }
+    calcoreEvent->setUid(uid);
 
     auto summary = object["summary"].toString();
-    sinkEvent.setSummary(summary);
     calcoreEvent->setSummary(summary);
 
     if (object.contains("description")) {
         auto description = object["description"].toString();
-        sinkEvent.setDescription(description);
         calcoreEvent->setDescription(description);
     }
 
     auto startTime = object["starts"].toDateTime();
     auto endTime = object["ends"].toDateTime();
-    sinkEvent.setStartTime(startTime);
-    sinkEvent.setEndTime(endTime);
 
     calcoreEvent->setDtStart(startTime);
     calcoreEvent->setDtEnd(endTime);
 
-    auto ical = KCalCore::ICalFormat().toRawString(static_cast<QSharedPointer<KCalCore::Incidence>>(calcoreEvent));
-    sinkEvent.setIcal(ical);
+    auto ical = KCalCore::ICalFormat().toICalString(calcoreEvent);
+    sinkEvent.setIcal(ical.toUtf8());
 
     sinkEvent.setCalendar(calendarId);
 
diff --git a/views/calendar/main.qml b/views/calendar/main.qml
index d2bdc1c3..672e3e21 100644
--- a/views/calendar/main.qml
+++ b/views/calendar/main.qml
@@ -47,19 +47,22 @@ ApplicationWindow {
             }],
             calendars: [{
                 id: "calendar1",
+                resource: "caldavresource",
                 name: "Test Calendar",
                 events: [
                     {
-                        "summary": "Test Event1",
-                        "description": "This is test event #1",
-                        "starts": "2018-04-10T14:03:00",
-                        "ends":   "2018-04-10T17:03:00",
+                        resource: "caldavresource",
+                        summary: "Test Event1",
+                        description: "This is test event #1",
+                        starts: "2018-04-10T14:03:00",
+                        ends:   "2018-04-10T17:03:00",
                     },
                     {
-                        "summary": "Test Event1",
-                        "description": "This is test event #1",
-                        "starts": "2018-04-11T09:03:00",
-                        "ends":   "2018-04-11T14:03:00",
+                        resource: "caldavresource",
+                        summary: "Test Event2",
+                        description: "This is test event #2",
+                        starts: "2018-04-11T09:03:00",
+                        ends:   "2018-04-11T14:03:00",
                     },
                 ],
             }],