X-Git-Url: http://Server1/repobrowser/?p=xestiacalendar%2F.git;a=blobdiff_plain;f=source%2Ftests%2Fxestiacalendar_icalfreebusyload.h;h=419aaf3219db97ecd6359a96bac022ead0b2a48f;hp=324339e998b359e746f01a863d559b584f7caffa;hb=2e304ff435c80c07daaf0d3fbe8a9ab7d1ae70b1;hpb=d058825f5e9ae3713e7805071a55e2794f0c3b90

diff --git a/source/tests/xestiacalendar_icalfreebusyload.h b/source/tests/xestiacalendar_icalfreebusyload.h
index 324339e..419aaf3 100644
--- a/source/tests/xestiacalendar_icalfreebusyload.h
+++ b/source/tests/xestiacalendar_icalfreebusyload.h
@@ -20,575 +20,575 @@
 
 TEST(iCalendarFreeBusy, BasicTests){
 
-	CalendarFreeBusyObject TestFreeBusy;
+	CalendarFreeBusyObject testFreeBusy;
 	
-	ASSERT_EQ(CALENDAROBJECTLOAD_MISSING, TestFreeBusy.LoadFile("iCalendarFreeBusy-Missing.vcf"));
-	ASSERT_EQ(CALENDAROBJECTLOAD_CANNOTOPEN, TestFreeBusy.LoadFile("iCalendarFreeBusy-InvalidPermissions.vcf"));
-	ASSERT_EQ(CALENDAROBJECTLOAD_OK, TestFreeBusy.LoadFile("iCalendarFreeBusy-Load1.vcf"));
+	ASSERT_EQ(CALENDAROBJECTLOAD_MISSING, testFreeBusy.LoadFile("iCalendarFreeBusy-Missing.vcf"));
+	ASSERT_EQ(CALENDAROBJECTLOAD_CANNOTOPEN, testFreeBusy.LoadFile("iCalendarFreeBusy-InvalidPermissions.vcf"));
+	ASSERT_EQ(CALENDAROBJECTLOAD_OK, testFreeBusy.LoadFile("iCalendarFreeBusy-Load1.vcf"));
 	
 }
 
 TEST(iCalendarFreeBusy, ObjectDataTests){
 	
-	CalendarFreeBusyObject TestFreeBusy;
-	ASSERT_EQ(CALENDAROBJECTLOAD_OK, TestFreeBusy.LoadFile("iCalendarFreeBusy-Load2.vcf"));
-	ASSERT_EQ(CALENDAROBJECTVALID_OK, TestFreeBusy.ValidBaseObject());
+	CalendarFreeBusyObject testFreeBusy;
+	ASSERT_EQ(CALENDAROBJECTLOAD_OK, testFreeBusy.LoadFile("iCalendarFreeBusy-Load2.vcf"));
+	ASSERT_EQ(CALENDAROBJECTVALID_OK, testFreeBusy.ValidBaseObject());
 	
 	// Tests for DTSTAMP.
 	
-	ASSERT_EQ("20160131T173000Z", TestFreeBusy.DateTimeStampData);
-	ASSERT_EQ("OTHER=PARAM", TestFreeBusy.DateTimeStampTokens);
+	ASSERT_EQ("20160131T173000Z", testFreeBusy.dateTimeStampData);
+	ASSERT_EQ("OTHER=PARAM", testFreeBusy.dateTimeStampTokens);
 	
 	// Tests for UID.
 	
-	ASSERT_EQ("b3a16392-ad86-4061-be53-c215af2306ff", TestFreeBusy.UniqueID);
-	ASSERT_EQ("UNIQUEPARAM=CERTAINLY;OKAY=MAYBENOT", TestFreeBusy.UniqueIDTokens);
+	ASSERT_EQ("b3a16392-ad86-4061-be53-c215af2306ff", testFreeBusy.UniqueID);
+	ASSERT_EQ("UNIQUEPARAM=CERTAINLY;OKAY=MAYBENOT", testFreeBusy.UniqueIDTokens);
 	
 	// Tests for CONTACT.
 	
-	std::string ContactData;
-	std::string ContactDataAltRep;
-	std::string ContactDataLanguage;
-	std::string ContactDataTokens;
+	std::string contactData;
+	std::string contactDataAltRep;
+	std::string contactDataLanguage;
+	std::string contactDataTokens;
 	
-	if (TestFreeBusy.ContactList.size() > 0){
+	if (testFreeBusy.contactList.size() > 0){
 		
-		ContactData = TestFreeBusy.ContactList[0];
+		contactData = testFreeBusy.contactList[0];
 		
 	}
 	
-	if (TestFreeBusy.ContactList.size() > 0){
+	if (testFreeBusy.contactList.size() > 0){
 		
-		ContactDataAltRep = TestFreeBusy.ContactListAltRep[0];
+		contactDataAltRep = testFreeBusy.contactListAltRep[0];
 		
 	}
 	
-	if (TestFreeBusy.ContactList.size() > 0){
+	if (testFreeBusy.contactList.size() > 0){
 		
-		ContactDataLanguage = TestFreeBusy.ContactListLanguage[0];
+		contactDataLanguage = testFreeBusy.contactListLanguage[0];
 		
 	}
 	
-	if (TestFreeBusy.ContactList.size() > 0){
+	if (testFreeBusy.contactList.size() > 0){
 		
-		ContactDataTokens = TestFreeBusy.ContactListTokens[0];
+		contactDataTokens = testFreeBusy.contactListTokens[0];
 		
 	}
 	
-	ASSERT_EQ("Contact Person", ContactData);
-	ASSERT_EQ("null:nodata", ContactDataAltRep);
-	ASSERT_EQ("en-GB", ContactDataLanguage);
-	ASSERT_EQ("EXAMPLE=TOKEN", ContactDataTokens);
+	ASSERT_EQ("Contact Person", contactData);
+	ASSERT_EQ("null:nodata", contactDataAltRep);
+	ASSERT_EQ("en-GB", contactDataLanguage);
+	ASSERT_EQ("EXAMPLE=TOKEN", contactDataTokens);
 	
 	// Tests for DTSTART.
 	
-	ASSERT_EQ("20160131T103000Z", TestFreeBusy.DateTimeStartData);
-	ASSERT_EQ("DATE-TIME", TestFreeBusy.DateTimeStartDataValue);
-	ASSERT_EQ("Europe/Truro", TestFreeBusy.DateTimeStartDataTimeZoneID);
-	ASSERT_EQ("PARAMONE=YES;PARAMTWO=NO", TestFreeBusy.DateTimeStartDataTokens);
+	ASSERT_EQ("20160131T103000Z", testFreeBusy.dateTimeStartData);
+	ASSERT_EQ("DATE-TIME", testFreeBusy.dateTimeStartDataValue);
+	ASSERT_EQ("Europe/Truro", testFreeBusy.dateTimeStartDataTimeZoneID);
+	ASSERT_EQ("PARAMONE=YES;PARAMTWO=NO", testFreeBusy.dateTimeStartDataTokens);
 
 	// Tests for DTEND.
 	
-	ASSERT_EQ("20160131T183000Z", TestFreeBusy.DateTimeEndData);
-	ASSERT_EQ("DATE-TIME", TestFreeBusy.DateTimeEndDataValue);
-	ASSERT_EQ("Europe/Truro", TestFreeBusy.DateTimeEndDataTimeZoneID);
-	ASSERT_EQ("PARAMFOUR=YES;PARAMTHREE=NO", TestFreeBusy.DateTimeEndDataTokens);
+	ASSERT_EQ("20160131T183000Z", testFreeBusy.dateTimeEndData);
+	ASSERT_EQ("DATE-TIME", testFreeBusy.dateTimeEndDataValue);
+	ASSERT_EQ("Europe/Truro", testFreeBusy.dateTimeEndDataTimeZoneID);
+	ASSERT_EQ("PARAMFOUR=YES;PARAMTHREE=NO", testFreeBusy.dateTimeEndDataTokens);
 	
 	// Tests for ORGANIZER.
 	
-	ASSERT_EQ("mailto:organiser@example.com", TestFreeBusy.OrganiserData);
-	ASSERT_EQ("ExampleOrganiser", TestFreeBusy.OrganiserDataCommonName);
-	ASSERT_EQ("null:nodata", TestFreeBusy.OrganiserDataDirectoryEntry);
-	ASSERT_EQ("mailto:organiser.noreply@example.com", TestFreeBusy.OrganiserDataSentByParam);
-	ASSERT_EQ("kw", TestFreeBusy.OrganiserDataLanguage);
-	ASSERT_EQ("HAPPY=DAYS", TestFreeBusy.OrganiserDataTokens);
+	ASSERT_EQ("mailto:organiser@example.com", testFreeBusy.organiserData);
+	ASSERT_EQ("ExampleOrganiser", testFreeBusy.organiserDataCommonName);
+	ASSERT_EQ("null:nodata", testFreeBusy.organiserDataDirectoryEntry);
+	ASSERT_EQ("mailto:organiser.noreply@example.com", testFreeBusy.organiserDataSentByParam);
+	ASSERT_EQ("kw", testFreeBusy.organiserDataLanguage);
+	ASSERT_EQ("HAPPY=DAYS", testFreeBusy.organiserDataTokens);
 	
 	// Tests for URL.
 
-	ASSERT_EQ("http://www.example.com/", TestFreeBusy.URLData);
-	ASSERT_EQ("EXTERNAL=YES", TestFreeBusy.URLDataTokens);
+	ASSERT_EQ("http://www.example.com/", testFreeBusy.urlData);
+	ASSERT_EQ("EXTERNAL=YES", testFreeBusy.urlDataTokens);
 	
 	// Tests for ATTENDEE. First ATTENDEE property.
 
-	std::string AttendeeDataMember;
-	std::string AttendeeDataDelegatedFrom;
-	std::string AttendeeDataDelegatedTo;
-	std::string AttendeeDataRole;
-	std::string AttendeeDataRSVP;
-	std::string AttendeeDataDirectoryEntry;
-	std::string AttendeeDataSentBy;
-	std::string AttendeeDataCommonName;
-	std::string AttendeeDataCalendarUserType;
-	std::string AttendeeDataParticipationStatus;
-	std::string AttendeeDataLanguage;
-	std::string AttendeeDataTokens;
-	std::string AttendeeData;
+	std::string attendeeDataMember;
+	std::string attendeeDataDelegatedFrom;
+	std::string attendeeDataDelegatedTo;
+	std::string attendeeDataRole;
+	std::string attendeeDataRSVP;
+	std::string attendeeDataDirectoryEntry;
+	std::string attendeeDataSentBy;
+	std::string attendeeDataCommonName;
+	std::string attendeeDataCalendarUserType;
+	std::string attendeeDataParticipationStatus;
+	std::string attendeeDataLanguage;
+	std::string attendeeDataTokens;
+	std::string attendeeData;
 
-	if (TestFreeBusy.AttendeeList.begin() != TestFreeBusy.AttendeeList.end()){
+	if (testFreeBusy.attendeeList.begin() != testFreeBusy.attendeeList.end()){
 		
-		AttendeeData = TestFreeBusy.AttendeeList[0];
+		attendeeData = testFreeBusy.attendeeList[0];
 		
 	}
 	
-	ASSERT_EQ("Attendee One", AttendeeData);
+	ASSERT_EQ("attendee One", attendeeData);
 	
 	// Second ATTENDEE property.
 	
-	AttendeeData.clear();
+	attendeeData.clear();
 	
-	if (TestFreeBusy.AttendeeList.size() > 1){
+	if (testFreeBusy.attendeeList.size() > 1){
 		
-		AttendeeData = TestFreeBusy.AttendeeList[1];
+		attendeeData = testFreeBusy.attendeeList[1];
 		
 	}
 
-	if (TestFreeBusy.AttendeeList.size() > 1){
+	if (testFreeBusy.attendeeList.size() > 1){
 		
-		AttendeeDataDelegatedFrom = TestFreeBusy.AttendeeListDelegatedFrom[1];
+		attendeeDataDelegatedFrom = testFreeBusy.attendeeListDelegatedFrom[1];
 		
 	}
 	
-	if (TestFreeBusy.AttendeeList.size() > 1){
+	if (testFreeBusy.attendeeList.size() > 1){
 		
-		AttendeeDataDelegatedTo = TestFreeBusy.AttendeeListDelegatedTo[1];
+		attendeeDataDelegatedTo = testFreeBusy.attendeeListDelegatedTo[1];
 		
 	}
 
-	if (TestFreeBusy.AttendeeList.size() > 1){
+	if (testFreeBusy.attendeeList.size() > 1){
 		
-		AttendeeDataRole = TestFreeBusy.AttendeeListRole[1];
+		attendeeDataRole = testFreeBusy.attendeeListRole[1];
 		
 	}
 	
-	if (TestFreeBusy.AttendeeList.size() > 1){
+	if (testFreeBusy.attendeeList.size() > 1){
 		
-		AttendeeDataRSVP = TestFreeBusy.AttendeeListRSVP[1];
+		attendeeDataRSVP = testFreeBusy.attendeeListRSVP[1];
 		
 	}
 	
-	ASSERT_EQ("Attendee Two", AttendeeData);
-	ASSERT_EQ("mailto:delegated.from@example.com", AttendeeDataDelegatedFrom);
-	ASSERT_EQ("mailto:delegated.to@example.com", AttendeeDataDelegatedTo);
-	ASSERT_EQ("CHAIR", AttendeeDataRole);
-	ASSERT_EQ("TRUE", AttendeeDataRSVP);
+	ASSERT_EQ("Attendee Two", attendeeData);
+	ASSERT_EQ("mailto:delegated.from@example.com", attendeeDataDelegatedFrom);
+	ASSERT_EQ("mailto:delegated.to@example.com", attendeeDataDelegatedTo);
+	ASSERT_EQ("CHAIR", attendeeDataRole);
+	ASSERT_EQ("TRUE", attendeeDataRSVP);
 
 	// Third ATTENDEE property.
 	
-	AttendeeData.clear();
+	attendeeData.clear();
 	
-	if (TestFreeBusy.AttendeeList.size() > 2){
+	if (testFreeBusy.attendeeList.size() > 2){
 		
-		AttendeeData = TestFreeBusy.AttendeeList[2];
+		attendeeData = testFreeBusy.attendeeList[2];
 		
 	}
 
-	if (TestFreeBusy.AttendeeList.size() > 2){
+	if (testFreeBusy.attendeeList.size() > 2){
 		
-		AttendeeDataDirectoryEntry = TestFreeBusy.AttendeeListDirectoryEntry[2];
+		attendeeDataDirectoryEntry = testFreeBusy.attendeeListDirectoryEntry[2];
 		
 	}
 	
-	if (TestFreeBusy.AttendeeList.size() > 2){
+	if (testFreeBusy.attendeeList.size() > 2){
 		
-		AttendeeDataSentBy = TestFreeBusy.AttendeeListSentBy[2];
+		attendeeDataSentBy = testFreeBusy.attendeeListSentBy[2];
 		
 	}
 
-	if (TestFreeBusy.AttendeeList.size() > 2){
+	if (testFreeBusy.attendeeList.size() > 2){
 		
-		AttendeeDataCommonName = TestFreeBusy.AttendeeListCommonName[2];
+		attendeeDataCommonName = testFreeBusy.attendeeListCommonName[2];
 		
 	}
 	
-	if (TestFreeBusy.AttendeeList.size() > 2){
+	if (testFreeBusy.attendeeList.size() > 2){
 		
-		AttendeeDataCalendarUserType = TestFreeBusy.AttendeeListCalendarUserType[2];
+		attendeeDataCalendarUserType = testFreeBusy.attendeeListCalendarUserType[2];
 		
 	}
 
-	if (TestFreeBusy.AttendeeList.size() > 2){
+	if (testFreeBusy.attendeeList.size() > 2){
 		
-		AttendeeDataParticipationStatus = TestFreeBusy.AttendeeListParticipationStatus[2];
+		attendeeDataParticipationStatus = testFreeBusy.attendeeListParticipationStatus[2];
 		
 	}
 
-	if (TestFreeBusy.AttendeeList.size() > 2){
+	if (testFreeBusy.attendeeList.size() > 2){
 		
-		AttendeeDataLanguage = TestFreeBusy.AttendeeListLanguage[2];
+		attendeeDataLanguage = testFreeBusy.attendeeListLanguage[2];
 		
 	}
 	
-	if (TestFreeBusy.AttendeeList.size() > 2){
+	if (testFreeBusy.attendeeList.size() > 2){
 		
-		AttendeeDataTokens = TestFreeBusy.AttendeeListTokens[2];
+		attendeeDataTokens = testFreeBusy.attendeeListTokens[2];
 		
 	}
 	
-	ASSERT_EQ("Attendee Three", AttendeeData);
-	ASSERT_EQ("null:nodata", AttendeeDataDirectoryEntry);
-	ASSERT_EQ("mailto:sent.by@example.com", AttendeeDataSentBy);
-	ASSERT_EQ("Attendee The Third", AttendeeDataCommonName);
-	ASSERT_EQ("INDIVIDUAL", AttendeeDataCalendarUserType);
-	ASSERT_EQ("ACCEPTED", AttendeeDataParticipationStatus);
-	ASSERT_EQ("kw", AttendeeDataLanguage);
-	ASSERT_EQ("EXAMPLE=DATA", AttendeeDataTokens);
+	ASSERT_EQ("Attendee Three", attendeeData);
+	ASSERT_EQ("null:nodata", attendeeDataDirectoryEntry);
+	ASSERT_EQ("mailto:sent.by@example.com", attendeeDataSentBy);
+	ASSERT_EQ("Attendee The Third", attendeeDataCommonName);
+	ASSERT_EQ("INDIVIDUAL", attendeeDataCalendarUserType);
+	ASSERT_EQ("ACCEPTED", attendeeDataParticipationStatus);
+	ASSERT_EQ("kw", attendeeDataLanguage);
+	ASSERT_EQ("EXAMPLE=DATA", attendeeDataTokens);
 	
 	// Get the first COMMENT.
 	
-	std::string CommentData;
+	std::string commentData;
 	
-	if (TestFreeBusy.CommentList.begin() != TestFreeBusy.CommentList.end()){
+	if (testFreeBusy.commentList.begin() != testFreeBusy.commentList.end()){
 		
-		CommentData = TestFreeBusy.CommentList[0];
+		commentData = testFreeBusy.commentList[0];
 		
 	}
 	
-	ASSERT_EQ("This is the first comment.", CommentData);
+	ASSERT_EQ("This is the first comment.", commentData);
 	
 	// Get the second COMMENT.
 	
-	CommentData.clear();
+	commentData.clear();
 	
-	std::string CommentDataAltRep;
-	std::string CommentDataLanguage;
+	std::string commentDataAltRep;
+	std::string commentDataLanguage;
 	
-	if (TestFreeBusy.CommentList.size() > 1){
+	if (testFreeBusy.commentList.size() > 1){
 		
-		CommentData = TestFreeBusy.CommentList[1];
+		commentData = testFreeBusy.commentList[1];
 		
 	}
 	
-	if (TestFreeBusy.CommentList.size() > 1){
+	if (testFreeBusy.commentList.size() > 1){
 		
-		CommentDataAltRep = TestFreeBusy.CommentListAltRep[1];
+		commentDataAltRep = testFreeBusy.commentListAltRep[1];
 		
 	}
 	
-	if (TestFreeBusy.CommentList.size() > 1){
+	if (testFreeBusy.commentList.size() > 1){
 		
-		CommentDataLanguage = TestFreeBusy.CommentListLanguage[1];
+		commentDataLanguage = testFreeBusy.commentListLanguage[1];
 		
 	}
 	
-	ASSERT_EQ("This is the second comment.", CommentData);
-	ASSERT_EQ("null:nodata", CommentDataAltRep);
-	ASSERT_EQ("en", CommentDataLanguage);
+	ASSERT_EQ("This is the second comment.", commentData);
+	ASSERT_EQ("null:nodata", commentDataAltRep);
+	ASSERT_EQ("en", commentDataLanguage);
 	
 	// Get the third COMMENT.
 	
-	CommentData.clear();
+	commentData.clear();
 	
-	std::string CommentDataTokens;
+	std::string commentDataTokens;
 	
-	if (TestFreeBusy.CommentList.size() > 2){
+	if (testFreeBusy.commentList.size() > 2){
 		
-		CommentData = TestFreeBusy.CommentList[2];
+		commentData = testFreeBusy.commentList[2];
 		
 	}
 	
-	if (TestFreeBusy.CommentList.size() > 2){
+	if (testFreeBusy.commentList.size() > 2){
 		
-		CommentDataTokens = TestFreeBusy.CommentListTokens[2];
+		commentDataTokens = testFreeBusy.commentListTokens[2];
 		
 	}
 	
-	ASSERT_EQ("This is the third comment.", CommentData);
-	ASSERT_EQ("ZEBRAS=YES", CommentDataTokens);
+	ASSERT_EQ("This is the third comment.", commentData);
+	ASSERT_EQ("ZEBRAS=YES", commentDataTokens);
 	
 	// Get the first FREEBUSY.
 	
-	std::string FreeBusyData;
+	std::string freeBusyData;
 	
-	if (TestFreeBusy.FreeBusyList.begin() != TestFreeBusy.FreeBusyList.end()){
+	if (testFreeBusy.FreeBusyList.begin() != testFreeBusy.FreeBusyList.end()){
 		
-		FreeBusyData = TestFreeBusy.FreeBusyList[0];
+		freeBusyData = testFreeBusy.FreeBusyList[0];
 		
 	}
 	
-	ASSERT_EQ("20160202T210000Z/PT1H", FreeBusyData);
+	ASSERT_EQ("20160202T210000Z/PT1H", freeBusyData);
 	
 	// Get the second FREEBUSY.
 	
-	FreeBusyData.clear();
+	freeBusyData.clear();
 	
-	std::string FreeBusyType;
+	std::string freeBusyType;
 	
-	if (TestFreeBusy.FreeBusyList.size() > 1){
+	if (testFreeBusy.FreeBusyList.size() > 1){
 		
-		FreeBusyData = TestFreeBusy.FreeBusyList[1];
+		freeBusyData = testFreeBusy.FreeBusyList[1];
 		
 	}
 	
-	if (TestFreeBusy.FreeBusyListType.size() > 1){
+	if (testFreeBusy.FreeBusyListType.size() > 1){
 		
-		FreeBusyType = TestFreeBusy.FreeBusyListType[1];
+		freeBusyType = testFreeBusy.FreeBusyListType[1];
 		
 	}
 
-	ASSERT_EQ("FREE", FreeBusyType);	
-	ASSERT_EQ("20160202T220000Z/PT1H", FreeBusyData);	
+	ASSERT_EQ("FREE", freeBusyType);	
+	ASSERT_EQ("20160202T220000Z/PT1H", freeBusyData);	
 	
 	// Get the third FREEBUSY.
 	
-	FreeBusyData.clear();
-	FreeBusyType.clear();
+	freeBusyData.clear();
+	freeBusyType.clear();
 	
 	std::string FreeBusyTokens;
 	
-	if (TestFreeBusy.FreeBusyList.size() > 2){
+	if (testFreeBusy.FreeBusyList.size() > 2){
 		
-		FreeBusyData = TestFreeBusy.FreeBusyList[2];
+		freeBusyData = testFreeBusy.FreeBusyList[2];
 		
 	}
 	
-	if (TestFreeBusy.FreeBusyListType.size() > 2){
+	if (testFreeBusy.FreeBusyListType.size() > 2){
 		
-		FreeBusyType = TestFreeBusy.FreeBusyListType[2];
+		freeBusyType = testFreeBusy.FreeBusyListType[2];
 		
 	}
 	
-	if (TestFreeBusy.FreeBusyListTokens.size() > 2){
+	if (testFreeBusy.FreeBusyListTokens.size() > 2){
 		
-		FreeBusyTokens = TestFreeBusy.FreeBusyListTokens[2];
+		FreeBusyTokens = testFreeBusy.FreeBusyListTokens[2];
 		
 	}
 
-	ASSERT_EQ("BUSY-UNAVAILABLE", FreeBusyType);	
-	ASSERT_EQ("20160202T230000Z/PT9H", FreeBusyData);
+	ASSERT_EQ("BUSY-UNAVAILABLE", freeBusyType);	
+	ASSERT_EQ("20160202T230000Z/PT9H", freeBusyData);
 	ASSERT_EQ("RESULT=ARGH;TEST=YES", FreeBusyTokens);
 	
 	// Get the first REQUEST-STATUS.
 
-	std::string RequestStatus;
+	std::string requestStatus;
 	
-	if (TestFreeBusy.RequestStatusData.begin() != TestFreeBusy.RequestStatusData.end()){
+	if (testFreeBusy.requestStatusData.begin() != testFreeBusy.requestStatusData.end()){
 		
-		RequestStatus = TestFreeBusy.RequestStatusData[0];
+		requestStatus = testFreeBusy.requestStatusData[0];
 		
 	}
 	
-	ASSERT_EQ("2.0;Success", RequestStatus);
+	ASSERT_EQ("2.0;Success", requestStatus);
 	
 	// Get the second REQUEST-STATUS.
 	
-	RequestStatus.clear();
+	requestStatus.clear();
 	
-	std::string RequestLanguage;
+	std::string requestLanguage;
 	
-	if (TestFreeBusy.RequestStatusData.size() > 1){
+	if (testFreeBusy.requestStatusData.size() > 1){
 		
-		RequestStatus = TestFreeBusy.RequestStatusData[1];
+		requestStatus = testFreeBusy.requestStatusData[1];
 		
 	}
 	
-	if (TestFreeBusy.RequestStatusData.size() > 1){
+	if (testFreeBusy.requestStatusData.size() > 1){
 		
-		RequestLanguage = TestFreeBusy.RequestStatusLanguage[1];
+		requestLanguage = testFreeBusy.requestStatusLanguage[1];
 		
 	}
 	
-	ASSERT_EQ("3.42;Really big irrecoverable error caused by the user", RequestStatus);
-	ASSERT_EQ("en", RequestLanguage);
+	ASSERT_EQ("3.42;Really big irrecoverable error caused by the user", requestStatus);
+	ASSERT_EQ("en", requestLanguage);
 	
 	// Get the third REQUEST-STATUS.
 	
-	RequestStatus.clear();
+	requestStatus.clear();
 	
-	std::string RequestTokens;
+	std::string requestTokens;
 	
-	if (TestFreeBusy.RequestStatusData.size() > 2){
+	if (testFreeBusy.requestStatusData.size() > 2){
 		
-		RequestStatus = TestFreeBusy.RequestStatusData[2];
+		requestStatus = testFreeBusy.requestStatusData[2];
 		
 	}
 	
-	if (TestFreeBusy.RequestStatusData.size() > 2){
+	if (testFreeBusy.requestStatusData.size() > 2){
 		
-		RequestTokens = TestFreeBusy.RequestStatusTokens[2];
+		requestTokens = testFreeBusy.requestStatusTokens[2];
 		
 	}
 	
-	ASSERT_EQ("3.7;Invalid calendar user", RequestStatus);
-	ASSERT_EQ("USER=MISSING", RequestTokens);
+	ASSERT_EQ("3.7;Invalid calendar user", requestStatus);
+	ASSERT_EQ("USER=MISSING", requestTokens);
 	
 	// Get the first X-EXAMPLE1 token.
 	
-	std::string XTokenName;
-	std::string XTokenData;
+	std::string xTokenName;
+	std::string xTokenData;
 	
-	if (TestFreeBusy.XTokensData.size() != 0 ){
+	if (testFreeBusy.xTokensData.size() != 0 ){
 	
-		XTokenData = TestFreeBusy.XTokensData[0];
+		xTokenData = testFreeBusy.xTokensData[0];
 		
 	}
 
-	if (TestFreeBusy.XTokensData.size() != 0){
+	if (testFreeBusy.xTokensData.size() != 0){
 	
-		XTokenName = TestFreeBusy.XTokensDataTokens[0];
+		xTokenName = testFreeBusy.xTokensDataTokens[0];
 		
 	}
 	
-	ASSERT_EQ("Moo", XTokenData);
-	ASSERT_EQ("X-EXAMPLE1", XTokenName);
+	ASSERT_EQ("Moo", xTokenData);
+	ASSERT_EQ("X-EXAMPLE1", xTokenName);
 	
 	// Get the second X-EXAMPLE1 token.
 
-	XTokenName.clear();
-	XTokenData.clear();
+	xTokenName.clear();
+	xTokenData.clear();
 	
-	if (TestFreeBusy.XTokensData.size() > 1){
+	if (testFreeBusy.xTokensData.size() > 1){
 	
-		XTokenData = TestFreeBusy.XTokensData[1];
+		xTokenData = testFreeBusy.xTokensData[1];
 		
 	}
 
-	if (TestFreeBusy.XTokensData.size() > 1){
+	if (testFreeBusy.xTokensData.size() > 1){
 	
-		XTokenName = TestFreeBusy.XTokensDataTokens[1];
+		xTokenName = testFreeBusy.xTokensDataTokens[1];
 		
 	}
 	
-	ASSERT_EQ("Meep", XTokenData);
-	ASSERT_EQ("X-EXAMPLE1;ANIMAL=NOPE", XTokenName);
+	ASSERT_EQ("Meep", xTokenData);
+	ASSERT_EQ("X-EXAMPLE1;ANIMAL=NOPE", xTokenName);
 	
 	// Get the third X-EXAMPLE1 token.
 
-	XTokenName.clear();
-	XTokenData.clear();
+	xTokenName.clear();
+	xTokenData.clear();
 	
-	if (TestFreeBusy.XTokensData.size() > 2){
+	if (testFreeBusy.xTokensData.size() > 2){
 	
-		XTokenData = TestFreeBusy.XTokensData[2];
+		xTokenData = testFreeBusy.xTokensData[2];
 		
 	}
 
-	if (TestFreeBusy.XTokensData.size() > 2){
+	if (testFreeBusy.xTokensData.size() > 2){
 	
-		XTokenName = TestFreeBusy.XTokensDataTokens[2];
+		xTokenName = testFreeBusy.xTokensDataTokens[2];
 		
 	}
 	
-	ASSERT_EQ("Meow", XTokenData);
-	ASSERT_EQ("X-EXAMPLE1;ANIMAL=CAT", XTokenName);
+	ASSERT_EQ("Meow", xTokenData);
+	ASSERT_EQ("X-EXAMPLE1;ANIMAL=CAT", xTokenName);
 	
 	// Get the first X-EXAMPLE2 token.
 	
-	XTokenName.clear();
-	XTokenData.clear();
+	xTokenName.clear();
+	xTokenData.clear();
 	
-	if (TestFreeBusy.XTokensData.size() > 3){
+	if (testFreeBusy.xTokensData.size() > 3){
 	
-		XTokenData = TestFreeBusy.XTokensData[3];
+		xTokenData = testFreeBusy.xTokensData[3];
 		
 	}
 
-	if (TestFreeBusy.XTokensData.size() > 3){
+	if (testFreeBusy.xTokensData.size() > 3){
 	
-		XTokenName = TestFreeBusy.XTokensDataTokens[3];
+		xTokenName = testFreeBusy.xTokensDataTokens[3];
 		
 	}
 	
-	ASSERT_EQ("Dish", XTokenData);
-	ASSERT_EQ("X-EXAMPLE2", XTokenName);
+	ASSERT_EQ("Dish", xTokenData);
+	ASSERT_EQ("X-EXAMPLE2", xTokenName);
 	
 	// Get the second X-EXAMPLE2 token.
 	
-	XTokenName.clear();
-	XTokenData.clear();
+	xTokenName.clear();
+	xTokenData.clear();
 	
-	if (TestFreeBusy.XTokensData.size() > 4){
+	if (testFreeBusy.xTokensData.size() > 4){
 	
-		XTokenData = TestFreeBusy.XTokensData[4];
+		xTokenData = testFreeBusy.xTokensData[4];
 		
 	}
 
-	if (TestFreeBusy.XTokensData.size() > 4){
+	if (testFreeBusy.xTokensData.size() > 4){
 	
-		XTokenName = TestFreeBusy.XTokensDataTokens[4];
+		xTokenName = testFreeBusy.xTokensDataTokens[4];
 		
 	}
 	
-	ASSERT_EQ("Fork", XTokenData);
-	ASSERT_EQ("X-EXAMPLE2;OBJECT=KITCHEN", XTokenName);
+	ASSERT_EQ("Fork", xTokenData);
+	ASSERT_EQ("X-EXAMPLE2;OBJECT=KITCHEN", xTokenName);
 	
 	// Get the third X-EXAMPLE2 token.
 	
-	XTokenName.clear();
-	XTokenData.clear();
+	xTokenName.clear();
+	xTokenData.clear();
 	
-	if (TestFreeBusy.XTokensData.size() > 5){
+	if (testFreeBusy.xTokensData.size() > 5){
 	
-		XTokenData = TestFreeBusy.XTokensData[5];
+		xTokenData = testFreeBusy.xTokensData[5];
 		
 	}
 
-	if (TestFreeBusy.XTokensData.size() > 5){
+	if (testFreeBusy.xTokensData.size() > 5){
 	
-		XTokenName = TestFreeBusy.XTokensDataTokens[5];
+		xTokenName = testFreeBusy.xTokensDataTokens[5];
 		
 	}
 	
-	ASSERT_EQ("Table", XTokenData);
-	ASSERT_EQ("X-EXAMPLE2;OBJECT=LIVINGROOM", XTokenName);
+	ASSERT_EQ("Table", xTokenData);
+	ASSERT_EQ("X-EXAMPLE2;OBJECT=LIVINGROOM", xTokenName);
 	
 	// Get the X-STATUS token.
 	
-	XTokenName.clear();
-	XTokenData.clear();
+	xTokenName.clear();
+	xTokenData.clear();
 	
-	if (TestFreeBusy.XTokensData.size() > 6){
+	if (testFreeBusy.xTokensData.size() > 6){
 	
-		XTokenData = TestFreeBusy.XTokensData[6];
+		xTokenData = testFreeBusy.xTokensData[6];
 		
 	}
 
-	if (TestFreeBusy.XTokensData.size() > 6){
+	if (testFreeBusy.xTokensData.size() > 6){
 	
-		XTokenName = TestFreeBusy.XTokensDataTokens[6];
+		xTokenName = testFreeBusy.xTokensDataTokens[6];
 		
 	}
 	
-	ASSERT_EQ("Idle", XTokenData);
-	ASSERT_EQ("X-STATUS;HOLIDAY=YES", XTokenName);
+	ASSERT_EQ("Idle", xTokenData);
+	ASSERT_EQ("X-STATUS;HOLIDAY=YES", xTokenName);
 	
 	// Get the X-TRANSPORT token.
 	
-	XTokenName.clear();
-	XTokenData.clear();
+	xTokenName.clear();
+	xTokenData.clear();
 	
-	if (TestFreeBusy.XTokensData.size() > 7){
+	if (testFreeBusy.xTokensData.size() > 7){
 	
-		XTokenData = TestFreeBusy.XTokensData[7];
+		xTokenData = testFreeBusy.xTokensData[7];
 		
 	}
 
-	if (TestFreeBusy.XTokensData.size() > 7){
+	if (testFreeBusy.xTokensData.size() > 7){
 	
-		XTokenName = TestFreeBusy.XTokensDataTokens[7];
+		xTokenName = testFreeBusy.xTokensDataTokens[7];
 		
 	}
 	
-	ASSERT_EQ("Private Hire", XTokenData);
-	ASSERT_EQ("X-TRANSPORT;PUBLIC=NO", XTokenName);
+	ASSERT_EQ("Private Hire", xTokenData);
+	ASSERT_EQ("X-TRANSPORT;PUBLIC=NO", xTokenName);
 	
 	// Get the X-PHANTOM-STATUS token.
 	
-	XTokenName.clear();
-	XTokenData.clear();
+	xTokenName.clear();
+	xTokenData.clear();
 	
-	if (TestFreeBusy.XTokensData.size() > 8){
+	if (testFreeBusy.xTokensData.size() > 8){
 	
-		XTokenData = TestFreeBusy.XTokensData[8];
+		xTokenData = testFreeBusy.xTokensData[8];
 		
 	}
 
-	if (TestFreeBusy.XTokensData.size() > 8){
+	if (testFreeBusy.xTokensData.size() > 8){
 	
-		XTokenName = TestFreeBusy.XTokensDataTokens[8];
+		xTokenName = testFreeBusy.xTokensDataTokens[8];
 		
 	}
 	
-	ASSERT_EQ("None", XTokenData);
-	ASSERT_EQ("X-PHANTOM-STATUS;HELP=NONE", XTokenName);
+	ASSERT_EQ("None", xTokenData);
+	ASSERT_EQ("X-PHANTOM-STATUS;HELP=NONE", xTokenName);
 	
 }
\ No newline at end of file