X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Ftests%2Fxestiacalendar_icaljournalsave.h;h=851b269167380fca9cead97a578675a4517b2034;hb=353e537a0c84a496c97e8889403c77d13a0b7341;hp=fb69016b8227957be31defb71784f9d6fdcea6ff;hpb=2a9d429d61c6cf4599b9d52e088cde3e30838e02;p=xestiacalendar%2F.git

diff --git a/source/tests/xestiacalendar_icaljournalsave.h b/source/tests/xestiacalendar_icaljournalsave.h
index fb69016..851b269 100644
--- a/source/tests/xestiacalendar_icaljournalsave.h
+++ b/source/tests/xestiacalendar_icaljournalsave.h
@@ -1,14 +1,14 @@
-// xestiacalendar_icaleventsave.h - Xestia Calendar iCalendar Event Component Save Unit Tests
+// xestiacalendar_icaljournalsave.h - Xestia Calendar iCalendar Journal Component Save Unit Tests
 //
-// (c) 2016 Xestia Software Development.
+// (c) 2016-2017 Xestia Software Development.
 //
 // This file is part of Xestia Calendar.
 //
-// Xestia Address Book is free software: you can redistribute it and/or modify
+// Xestia Calendar 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,
+// Xestia Calendar 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.
@@ -20,21 +20,21 @@
 
 TEST(iCalendarSaveJournal, SaveEventTests){
 
-	CalendarJournalObject TestJournal;
-	CalendarJournalObject TestJournal2;
+	CalendarJournalObject testJournal;
+	CalendarJournalObject testJournal2;
 	
 	// Load the test journal information.
 	
-	ASSERT_EQ(CALENDAROBJECTLOAD_OK, TestJournal.LoadFile("iCalendarJournal-Load1.vcf"));
-	ASSERT_EQ(CALENDAROBJECTVALID_OK, TestJournal.ValidBaseObject());
+	ASSERT_EQ(CALENDAROBJECTLOAD_OK, testJournal.LoadFile("iCalendarJournal-Load1.vcf"));
+	ASSERT_EQ(CALENDAROBJECTVALID_OK, testJournal.ValidBaseObject());
 	
-	ASSERT_EQ(CALENDAROBJECTSAVE_CANNOTOPEN, TestJournal.SaveFile("/stupidfilelocation/dontsavehere.ics"));
+	ASSERT_EQ(CALENDAROBJECTSAVE_CANNOTOPEN, testJournal.SaveFile("/stupidfilelocation/dontsavehere.ics"));
 	
 	// Save the data to a string and compare the data.
 
 	// First journal file.
 	
-	std::string SaveDataComparison = "BEGIN:VCALENDAR\n"
+	std::string saveDataComparison = "BEGIN:VCALENDAR\n"
 	"VERSION:2.0\n"
 	"PRODID:-//Xestia//Calendar Unit Testing//KW\n"
 	"BEGIN:VJOURNAL\n"
@@ -46,20 +46,20 @@ TEST(iCalendarSaveJournal, SaveEventTests){
 	"END:VJOURNAL\n"
 	"END:VCALENDAR";
 	
-	std::string SaveData;
+	std::string saveData;
 	
-	TestJournal.SaveString(&SaveData);
+	testJournal.SaveString(&saveData);
 	
-	ASSERT_EQ(SaveDataComparison, SaveData);
+	ASSERT_EQ(saveDataComparison, saveData);
 	
-	SaveData.clear();
+	saveData.clear();
 
-	ASSERT_EQ(CALENDAROBJECTLOAD_OK, TestJournal2.LoadFile("iCalendarJournal-Load2.vcf"));
-	ASSERT_EQ(CALENDAROBJECTVALID_OK, TestJournal2.ValidBaseObject());
+	ASSERT_EQ(CALENDAROBJECTLOAD_OK, testJournal2.LoadFile("iCalendarJournal-Load2.vcf"));
+	ASSERT_EQ(CALENDAROBJECTVALID_OK, testJournal2.ValidBaseObject());
 
-	TestJournal2.SaveString(&SaveData);
+	testJournal2.SaveString(&saveData);
 	
-	SaveDataComparison = "BEGIN:VCALENDAR\n"
+	saveDataComparison = "BEGIN:VCALENDAR\n"
 	"VERSION:2.0\n"
 	"PRODID:-//Xestia//Calendar Unit Testing//KW\n"
 	"BEGIN:VJOURNAL\n"
@@ -104,9 +104,31 @@ TEST(iCalendarSaveJournal, SaveEventTests){
 	"DESCRIPTION;ALTREP=\"null:nodata\";LANGUAGE=en-GB:This is the second journal de\n"
 	" scription.\n"
 	"DESCRIPTION;ZEBRAS=NO:This is the third journal description.\n"
+	"EXDATE:20160125T120000Z\n"
+	"EXDATE;TZID=Europe/Truro;VALUE=DATE-TIME:20160125T130000Z\n"
+	"EXDATE;ZOOP=ZIPPO:20160125T133000Z\n"
+	"RELATED-TO:person.1@example.com\n"
+	"RELATED-TO;RELTYPE=PARENT:person.2@example.com\n"
+	"RELATED-TO;SCHOOL=MEETING:person.3@example.com\n"
+	"RDATE:20160120\n"
+	"RDATE;VALUE=DATE;TZID=Europe/Truro:20160121\n"
+	"RDATE;ZILCH=DATA:20160520\n"
+	"REQUEST-STATUS:2.0;Success\n"
+	"REQUEST-STATUS;LANGUAGE=en:3.42;Really big irrecoverable error caused by the \n"
+	" user\n"
+	"REQUEST-STATUS;USER=MISSING:3.7;Invalid calendar user\n"
+	"X-EXAMPLE1:Moo\n"
+	"X-EXAMPLE1;ANIMAL=NOPE:Meep\n"
+	"X-EXAMPLE1;ANIMAL=CAT:Meow\n"
+	"X-EXAMPLE2:Dish\n"
+	"X-EXAMPLE2;OBJECT=KITCHEN:Fork\n"
+	"X-EXAMPLE2;OBJECT=LIVINGROOM:Table\n"
+	"X-STATUS;HOLIDAY=YES:Idle\n"
+	"X-TRANSPORT;PUBLIC=NO:Private Hire\n"
+	"X-PHANTOM-STATUS;HELP=NONE:None\n"
 	"END:VJOURNAL\n"
 	"END:VCALENDAR";
 	
-	ASSERT_EQ(SaveDataComparison, SaveData);
+	ASSERT_EQ(saveDataComparison, saveData);
 
 }
\ No newline at end of file