From f638e0b184a920395da4d9d1ec2072e03574b608 Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Sun, 7 Feb 2016 13:55:10 +0000 Subject: [PATCH] Removed CalendarAlarmObject object and unit tests. CalendarAlarmObject to be implemented in CalendarEventObject and CalendarJournalObject. --- .../objects/calendaralarm/CalendarAlarm.cpp | 117 ------------------ source/objects/calendaralarm/CalendarAlarm.h | 18 --- source/tests/xestiacalendar_icalalarmload.h | 33 ----- 3 files changed, 168 deletions(-) delete mode 100644 source/objects/calendaralarm/CalendarAlarm.cpp delete mode 100644 source/objects/calendaralarm/CalendarAlarm.h delete mode 100644 source/tests/xestiacalendar_icalalarmload.h diff --git a/source/objects/calendaralarm/CalendarAlarm.cpp b/source/objects/calendaralarm/CalendarAlarm.cpp deleted file mode 100644 index e9f122a..0000000 --- a/source/objects/calendaralarm/CalendarAlarm.cpp +++ /dev/null @@ -1,117 +0,0 @@ -#include "CalendarAlarm.h" - -using namespace std; - -CalendarObjectValidResult CalendarAlarmObject::ValidObject(){ - - bool ValidBegin = false; - bool ValidEnd = false; - bool ValidTimeZoneID = false; - int SeekCount = 0; - string PropertyName; - - // Look for BEGIN:VEVENT. - - for (vector::iterator iter = ObjectName.begin(); - iter != ObjectName.end(); iter++){ - - if (ObjectName[SeekCount] == "BEGIN" && - ObjectData[SeekCount] == "VALARM"){ - - if (ValidBegin == false){ - ValidBegin = true; - } else { - return CALENDAROBJECTVALID_INVALIDFORMAT; - } - - } - - if (ObjectName[SeekCount] == "END" && - ObjectData[SeekCount] == "VALARM" && - ValidBegin == false){ - - return CALENDAROBJECTVALID_INVALIDFORMAT; - - } - - SeekCount++; - - } - - SeekCount = 0; - - // Look for DTSTAMP. - - for (vector::iterator iter = ObjectName.begin(); - iter != ObjectName.end(); iter++){ - - try{ - PropertyName = ObjectName[SeekCount].substr(0,4); - } - - catch(const out_of_range& oor){ - continue; - } - - if (PropertyName == "TZID"){ - - if (ValidTimeZoneID == false){ - ValidTimeZoneID = true; - } else { - return CALENDAROBJECTVALID_INVALIDFORMAT; - } - - } - - SeekCount++; - - } - - SeekCount = 0; - - // Look for END:VEVENT. - - for (vector::iterator iter = ObjectName.begin(); - iter != ObjectName.end(); iter++){ - - if (ObjectName[SeekCount] == "END" && - ObjectData[SeekCount] == "VALARM"){ - - if (ValidEnd == false){ - ValidEnd = true; - } else { - return CALENDAROBJECTVALID_INVALIDFORMAT; - } - - } - - SeekCount++; - - } - - // Check if the VEVENT is valid. - - if (ValidBegin == true && - ValidEnd == true && - ValidTimeZoneID == true){ - - return CALENDAROBJECTVALID_OK; - - } else { - - return CALENDAROBJECTVALID_INVALIDFORMAT; - - } - -} - -void CalendarAlarmObject::ProcessData(){ - - // Process the data. - - multimap DataReceived; - map PropertyData; - string *PropertyNameData = nullptr; - int ObjectSeekCount = 0; - -} \ No newline at end of file diff --git a/source/objects/calendaralarm/CalendarAlarm.h b/source/objects/calendaralarm/CalendarAlarm.h deleted file mode 100644 index b9d0b4a..0000000 --- a/source/objects/calendaralarm/CalendarAlarm.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef __OBJECTS_CALENDARALARM_CALENDARALARM_H__ -#define __OBJECTS_CALENDARALARM_CALENDARALARM_H__ - -#include "../calendarobject/CalendarObject.h" - -using namespace std; - -class CalendarAlarmObject: public CalendarObject{ - - CalendarObjectValidResult ValidObject(); - - private: - - void ProcessData(); - -}; - -#endif \ No newline at end of file diff --git a/source/tests/xestiacalendar_icalalarmload.h b/source/tests/xestiacalendar_icalalarmload.h deleted file mode 100644 index 4e6420d..0000000 --- a/source/tests/xestiacalendar_icalalarmload.h +++ /dev/null @@ -1,33 +0,0 @@ -// xestiacalendar_icaleventload.h - Xestia Calendar iCalendar Alarm Component Unit Tests -// -// (c) 2016 Xestia Software Development. -// -// This file is part of Xestia Calendar. -// -// Xestia Address Book is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by the -// Free Software Foundation, version 3 of the license. -// -// Xestia Address Book is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with Xestia Calendar. If not, see - -#include "../objects/calendaralarm/CalendarAlarm.h" - -TEST(iCalendarAlarm, BasicTests){ - - CalendarAlarmObject TestAlarm; - - ASSERT_EQ(CALENDAROBJECTLOAD_MISSING, TestAlarm.LoadFile("iCalendarAlarm-Missing.vcf")); - ASSERT_EQ(CALENDAROBJECTLOAD_CANNOTOPEN, TestAlarm.LoadFile("iCalendarAlarm-InvalidPermissions.vcf")); - ASSERT_EQ(CALENDAROBJECTLOAD_OK, TestAlarm.LoadFile("iCalendarAlarm-Load1.vcf")); - -} - -TEST(iCalendarAlarm, ObjectDataTests){ - -} \ No newline at end of file -- 2.39.2