X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Ftests%2Fxestiacalendar_icaleventsave.h;h=5686d3c0927ae551740a8c47878140c8755221bc;hb=50a13e0f5ee4ac33c9565b97cd7f28547284c322;hp=f2e4847d0f6d1277d9f621047debb5472533e7a2;hpb=428c04b066eb433a9cad124bf7d659af8b699544;p=xestiacalendar%2F.git

diff --git a/source/tests/xestiacalendar_icaleventsave.h b/source/tests/xestiacalendar_icaleventsave.h
index f2e4847..5686d3c 100644
--- a/source/tests/xestiacalendar_icaleventsave.h
+++ b/source/tests/xestiacalendar_icaleventsave.h
@@ -22,6 +22,7 @@ TEST(iCalendarSaveEvent, SaveEventTests){
 
 	CalendarEventObject TestEvent;
 	CalendarEventObject TestEvent2;
+	CalendarEventObject TestEvent3;
 	
 	// Load the test event.
 	
@@ -38,7 +39,7 @@ TEST(iCalendarSaveEvent, SaveEventTests){
 
 	// First contact file.
 	
-	std::string SaveDataComparison = "BEGIN:VCARD\n"
+	std::string SaveDataComparison = "BEGIN:VCALENDAR\n"
 	"VERSION:2.0\n"
 	"METHOD;EXAMPLE=DATA:REQUEST\n"
 	"CALSCALE;MORE=YES:GREGORIAN\n"
@@ -52,7 +53,7 @@ TEST(iCalendarSaveEvent, SaveEventTests){
 	" now if multiple line processing is going to work without it. I mean seriousl\n"
 	" y, how annoying can this potentially be?\n"
 	"END:VEVENT\n"
-	"END:VCARD";
+	"END:VCALENDAR";
 	
 	std::string SaveData;
 	
@@ -66,7 +67,7 @@ TEST(iCalendarSaveEvent, SaveEventTests){
 	ASSERT_EQ(CALENDAROBJECTVALID_OK, TestEvent2.ValidBaseObject());
 
 	SaveData.clear();
-	SaveDataComparison = "BEGIN:VCARD\n"
+	SaveDataComparison = "BEGIN:VCALENDAR\n"
 	"VERSION:2.0\n"
 	"PRODID:-//Xestia//Calendar Unit Testing//KW\n"
 	"BEGIN:VEVENT\n"
@@ -142,6 +143,9 @@ TEST(iCalendarSaveEvent, SaveEventTests){
 	" l\n"
 	"ATTACH;FMTTYPE=text/plain;VALUE=BINARY;ENCODING=BASE64;STUPID=EXAMPLE:VGhpcyB\n"
 	" pcyBhbiBleGFtcGxlIGZpbGU=\n"
+	"X-EXAMPLE1;YAY=YES:Example Data 1\n"
+	"X-EXAMPLE2;NOPE=YEP:Example Data 2\n"
+	"X-EXAMPLE3;WORLD=NO:Example Data 3\n"
 	"END:VALARM\n"
 	"BEGIN:VALARM\n"
 	"ACTION;FLASHING=LIGHTS:DISPLAY\n"
@@ -150,6 +154,9 @@ TEST(iCalendarSaveEvent, SaveEventTests){
 	"DESCRIPTION;ALTREP=\"null:nodata\";LANGUAGE=kw;TERRIBLE=TOKEN:This is the secon\n"
 	" d alarm.\n"
 	"REPEAT;SLEEP=ALWAYS:PT3M\n"
+	"X-EXAMPLE1;YAY=YES:Example Data 1\n"
+	"X-EXAMPLE2;NOPE=YEP:Example Data 2\n"
+	"X-EXAMPLE3;WORLD=NO:Example Data 3\n"
 	"END:VALARM\n"
 	"BEGIN:VALARM\n"
 	"ACTION;FLASHING=LIGHTS:EMAIL\n"
@@ -171,12 +178,44 @@ TEST(iCalendarSaveEvent, SaveEventTests){
 	" l\n"
 	"ATTACH;FMTTYPE=text/plain;VALUE=BINARY;ENCODING=BASE64;STUPID=EXAMPLE:VGhpcyB\n"
 	" pcyBhbiBleGFtcGxlIGZpbGU=\n"
+	"X-EXAMPLE1;YAY=YES:Example Data 1\n"
+	"X-EXAMPLE2;NOPE=YEP:Example Data 2\n"
+	"X-EXAMPLE3;WORLD=NO:Example Data 3\n"
 	"END:VALARM\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:VEVENT\n"
-	"END:VCARD";
+	"END:VCALENDAR";
 
 	TestEvent2.SaveString(&SaveData);
 	
 	ASSERT_EQ(SaveDataComparison, SaveData);
 	
+	ASSERT_EQ(CALENDAROBJECTLOAD_OK, TestEvent3.LoadFile("iCalendarEvent-Load3.vcf"));
+	ASSERT_EQ(CALENDAROBJECTVALID_OK, TestEvent3.ValidBaseObject());
+
+	SaveData.clear();
+
+	SaveDataComparison = "BEGIN:VCALENDAR\n"
+	"VERSION:2.0\n"
+	"PRODID:-//Xestia//Calendar Unit Testing//KW\n"
+	"BEGIN:VEVENT\n"
+	"UID:b3a16392-ad86-4061-be53-c215af2306e1\n"
+	"DTSTAMP:20160127T111200Z\n"
+	"DTSTART:20160122T183000Z\n"
+	"DURATION;TEST=EXAMPLE:PT1H\n"
+	"END:VEVENT\n"
+	"END:VCALENDAR";
+
+	TestEvent3.SaveString(&SaveData);
+
+	ASSERT_EQ(SaveDataComparison, SaveData);
+
 }
\ No newline at end of file