X-Git-Url: http://Server1/repobrowser/?p=xestiacalendar%2F.git;a=blobdiff_plain;f=source%2Ftests%2Fxestiacalendar_icaljournalload.h;h=7c0b0ce1e6249ad7ef4c61902718512b10f68ac6;hp=13cb988967a8fca3e478834dbaa9dd3585e3be67;hb=2e304ff435c80c07daaf0d3fbe8a9ab7d1ae70b1;hpb=d058825f5e9ae3713e7805071a55e2794f0c3b90

diff --git a/source/tests/xestiacalendar_icaljournalload.h b/source/tests/xestiacalendar_icaljournalload.h
index 13cb988..7c0b0ce 100644
--- a/source/tests/xestiacalendar_icaljournalload.h
+++ b/source/tests/xestiacalendar_icaljournalload.h
@@ -20,964 +20,964 @@
 
 TEST(iCalendarJournal, BasicTests){
 
-	CalendarJournalObject TestJournal;
+	CalendarJournalObject testJournal;
 	
-	ASSERT_EQ(CALENDAROBJECTLOAD_MISSING, TestJournal.LoadFile("iCalendarJournal-Missing.vcf"));
-	ASSERT_EQ(CALENDAROBJECTLOAD_CANNOTOPEN, TestJournal.LoadFile("iCalendarJournal-InvalidPermissions.vcf"));
-	ASSERT_EQ(CALENDAROBJECTLOAD_OK, TestJournal.LoadFile("iCalendarJournal-Load1.vcf"));
+	ASSERT_EQ(CALENDAROBJECTLOAD_MISSING, testJournal.LoadFile("iCalendarJournal-Missing.vcf"));
+	ASSERT_EQ(CALENDAROBJECTLOAD_CANNOTOPEN, testJournal.LoadFile("iCalendarJournal-InvalidPermissions.vcf"));
+	ASSERT_EQ(CALENDAROBJECTLOAD_OK, testJournal.LoadFile("iCalendarJournal-Load1.vcf"));
 	
 }
 
 TEST(iCalendarJournal, ObjectDataTests){
 	
-	CalendarJournalObject TestJournal;
-	ASSERT_EQ(CALENDAROBJECTLOAD_OK, TestJournal.LoadFile("iCalendarJournal-Load2.vcf"));
-	ASSERT_EQ(CALENDAROBJECTVALID_OK, TestJournal.ValidBaseObject());
+	CalendarJournalObject testJournal;
+	ASSERT_EQ(CALENDAROBJECTLOAD_OK, testJournal.LoadFile("iCalendarJournal-Load2.vcf"));
+	ASSERT_EQ(CALENDAROBJECTVALID_OK, testJournal.ValidBaseObject());
 	
 	// Tests for DTSTAMP.
 	
-	ASSERT_EQ("20160131T141500Z", TestJournal.DateTimeStampData);
-	ASSERT_EQ("OTHER=PARAM", TestJournal.DateTimeStampTokens);
+	ASSERT_EQ("20160131T141500Z", testJournal.dateTimeStampData);
+	ASSERT_EQ("OTHER=PARAM", testJournal.dateTimeStampTokens);
 	
 	// Tests for UID.
 	
-	ASSERT_EQ("b3a16392-ad86-4061-be53-c215af2306c1", TestJournal.UniqueID);
-	ASSERT_EQ("UNIQUEPARAM=CERTAINLY;OKAY=MAYBENOT", TestJournal.UniqueIDTokens);
+	ASSERT_EQ("b3a16392-ad86-4061-be53-c215af2306c1", testJournal.uniqueID);
+	ASSERT_EQ("UNIQUEPARAM=CERTAINLY;OKAY=MAYBENOT", testJournal.uniqueIDTokens);
 	
 	// Tests for CLASS.
 	
-	ASSERT_EQ("PUBLIC", TestJournal.ClassData);
-	ASSERT_EQ("CHOCOLATE=BAR", TestJournal.ClassDataTokens);
+	ASSERT_EQ("PUBLIC", testJournal.classData);
+	ASSERT_EQ("CHOCOLATE=BAR", testJournal.classDataTokens);
 	
 	// Tests for DTSTART.
 	
-	ASSERT_EQ("20160131T143500Z", TestJournal.DateTimeStartData);
-	ASSERT_EQ("DATE-TIME", TestJournal.DateTimeStartDataValue);
-	ASSERT_EQ("Europe/Truro", TestJournal.DateTimeStartDataTimeZoneID);
-	ASSERT_EQ("PARAMONE=YES;PARAMTWO=NO", TestJournal.DateTimeStartDataTokens);
+	ASSERT_EQ("20160131T143500Z", testJournal.dateTimeStartData);
+	ASSERT_EQ("DATE-TIME", testJournal.dateTimeStartDataValue);
+	ASSERT_EQ("Europe/Truro", testJournal.dateTimeStartDataTimeZoneID);
+	ASSERT_EQ("PARAMONE=YES;PARAMTWO=NO", testJournal.dateTimeStartDataTokens);
 	
 	// Tests for LAST-MODIFIED.
 	
-	ASSERT_EQ("20160131T143700Z", TestJournal.LastModifiedData);
-	ASSERT_EQ("FUTURE=YES", TestJournal.LastModifiedTokens);
+	ASSERT_EQ("20160131T143700Z", testJournal.lastModifiedData);
+	ASSERT_EQ("FUTURE=YES", testJournal.lastModifiedTokens);
 	
 	// Tests for ORGANIZER.
 	
-	ASSERT_EQ("mailto:organiser@example.com", TestJournal.OrganiserData);
-	ASSERT_EQ("ExampleOrganiser", TestJournal.OrganiserDataCommonName);
-	ASSERT_EQ("null:nodata", TestJournal.OrganiserDataDirectoryEntry);
-	ASSERT_EQ("mailto:organiser.noreply@example.com", TestJournal.OrganiserDataSentByParam);
-	ASSERT_EQ("kw", TestJournal.OrganiserDataLanguage);
-	ASSERT_EQ("HAPPY=DAYS", TestJournal.OrganiserDataTokens);
+	ASSERT_EQ("mailto:organiser@example.com", testJournal.organiserData);
+	ASSERT_EQ("ExampleOrganiser", testJournal.organiserDataCommonName);
+	ASSERT_EQ("null:nodata", testJournal.organiserDataDirectoryEntry);
+	ASSERT_EQ("mailto:organiser.noreply@example.com", testJournal.organiserDataSentByParam);
+	ASSERT_EQ("kw", testJournal.organiserDataLanguage);
+	ASSERT_EQ("HAPPY=DAYS", testJournal.organiserDataTokens);
 	
 	// Tests for RECURRENCE-ID.
 	
-	ASSERT_EQ("20160131", TestJournal.RecurranceIDData);
-	ASSERT_EQ("Europe/Truro", TestJournal.RecurranceIDDataTimeZoneParam);
-	ASSERT_EQ("THISANDFUTURE", TestJournal.RecurranceIDDataRangeParam);
-	ASSERT_EQ("DATE", TestJournal.RecurranceIDDataValue);
-	ASSERT_EQ("EXAMPLE=DATA", TestJournal.RecurranceIDDataTokens);
+	ASSERT_EQ("20160131", testJournal.recurranceIDData);
+	ASSERT_EQ("Europe/Truro", testJournal.recurranceIDDataTimeZoneParam);
+	ASSERT_EQ("THISANDFUTURE", testJournal.recurranceIDDataRangeParam);
+	ASSERT_EQ("DATE", testJournal.recurranceIDDataValue);
+	ASSERT_EQ("EXAMPLE=DATA", testJournal.recurranceIDDataTokens);
 	
 	// Tests for SEQUENCE.
 	
-	ASSERT_EQ(7, TestJournal.SequenceData);
-	ASSERT_EQ("TEST=YAY", TestJournal.SequenceTokens);
+	ASSERT_EQ(7, testJournal.sequenceData);
+	ASSERT_EQ("TEST=YAY", testJournal.sequenceTokens);
 	
 	// Tests for STATUS.
 	
-	ASSERT_EQ("2.0;Success", TestJournal.StatusData);
-	ASSERT_EQ("kw", TestJournal.StatusLanguage);
-	ASSERT_EQ("FAVOURITE=RICHTEA;NOTLIKE=UNKNOWN", TestJournal.StatusTokens);
+	ASSERT_EQ("2.0;Success", testJournal.statusData);
+	ASSERT_EQ("kw", testJournal.statusLanguage);
+	ASSERT_EQ("FAVOURITE=RICHTEA;NOTLIKE=UNKNOWN", testJournal.statusTokens);
 	
 	// Tests for SUMMARY.
 	
-	ASSERT_EQ("A summary of the journal entry.", TestJournal.SummaryData);
-	ASSERT_EQ("null:nodata", TestJournal.SummaryDataAltRep);
-	ASSERT_EQ("kw", TestJournal.SummaryDataLanguage);
-	ASSERT_EQ("FAVOURITE=TOFU;NOTLIKE=NONE", TestJournal.SummaryDataTokens);
+	ASSERT_EQ("A summary of the journal entry.", testJournal.summaryData);
+	ASSERT_EQ("null:nodata", testJournal.summaryDataAltRep);
+	ASSERT_EQ("kw", testJournal.summaryDataLanguage);
+	ASSERT_EQ("FAVOURITE=TOFU;NOTLIKE=NONE", testJournal.summaryDataTokens);
 	
 	// Tests for URL.
 
-	ASSERT_EQ("http://www.example.com/", TestJournal.URLData);
-	ASSERT_EQ("EXTERNAL=YES", TestJournal.URLDataTokens);
+	ASSERT_EQ("http://www.example.com/", testJournal.urlData);
+	ASSERT_EQ("EXTERNAL=YES", testJournal.urlDataTokens);
 	
 	// Tests for RRULE.
 	
-	ASSERT_EQ("FREQ=DAILY;COUNT=10", TestJournal.RecurranceRuleData);
-	ASSERT_EQ("TEST=DATA", TestJournal.RecurranceRuleDataTokens);
+	ASSERT_EQ("FREQ=DAILY;COUNT=10", testJournal.recurranceRuleData);
+	ASSERT_EQ("TEST=DATA", testJournal.recurranceRuleDataTokens);
 	
 	// Tests for ATTACH. First ATTACH property.
 
-	std::string AttachData;
-	std::string AttachDataFormatType;
-	std::string AttachDataValue;
-	std::string AttachDataEncoding;
-	std::string AttachDataTokens;
+	std::string attachData;
+	std::string attachDataFormatType;
+	std::string attachDataValue;
+	std::string attachDataEncoding;
+	std::string attachDataTokens;
 
-	if (TestJournal.AttachList.begin() != TestJournal.AttachList.end()){
+	if (testJournal.attachList.begin() != testJournal.attachList.end()){
 		
-		AttachData = TestJournal.AttachList[0];
+		attachData = testJournal.attachList[0];
 		
 	}
 	
-	if (TestJournal.AttachListFormatType.begin() != TestJournal.AttachListFormatType.end()){
+	if (testJournal.attachListFormatType.begin() != testJournal.attachListFormatType.end()){
 		
-		AttachDataFormatType = TestJournal.AttachListFormatType[0];
+		attachDataFormatType = testJournal.attachListFormatType[0];
 		
 	}
 
-	ASSERT_EQ("http://www.example.com/", AttachData);
-	ASSERT_EQ("application/internet-shortcut", AttachDataFormatType);
+	ASSERT_EQ("http://www.example.com/", attachData);
+	ASSERT_EQ("application/internet-shortcut", attachDataFormatType);
 	
 	// Second ATTACH property.
 	
-	AttachData.clear();
-	AttachDataFormatType.clear();
-	AttachDataValue.clear();
-	AttachDataEncoding.clear();
+	attachData.clear();
+	attachDataFormatType.clear();
+	attachDataValue.clear();
+	attachDataEncoding.clear();
 	
-	if (TestJournal.AttachList.size() > 1){
+	if (testJournal.attachList.size() > 1){
 		
-		AttachData = TestJournal.AttachList[1];
+		attachData = testJournal.attachList[1];
 		
 	}
 	
-	if (TestJournal.AttachListFormatType.size() > 1){
+	if (testJournal.attachListFormatType.size() > 1){
 		
-		AttachDataFormatType = TestJournal.AttachListFormatType[1];
+		attachDataFormatType = testJournal.attachListFormatType[1];
 		
 	}
 
-	ASSERT_EQ("http://www.example.com/page2.html", AttachData);
-	ASSERT_EQ("application/internet-shortcut", AttachDataFormatType);
+	ASSERT_EQ("http://www.example.com/page2.html", attachData);
+	ASSERT_EQ("application/internet-shortcut", attachDataFormatType);
 	
 	// Third ATTACH property.
 
-	AttachData.clear();
-	AttachDataFormatType.clear();
-	AttachDataValue.clear();
-	AttachDataEncoding.clear();
-	AttachDataTokens.clear();
+	attachData.clear();
+	attachDataFormatType.clear();
+	attachDataValue.clear();
+	attachDataEncoding.clear();
+	attachDataTokens.clear();
 	
-	if (TestJournal.AttachList.size() > 2){
+	if (testJournal.attachList.size() > 2){
 		
-		AttachData = TestJournal.AttachList[2];
+		attachData = testJournal.attachList[2];
 		
 	}
 	
-	if (TestJournal.AttachListFormatType.size() > 2){
+	if (testJournal.attachListFormatType.size() > 2){
 		
-		AttachDataFormatType = TestJournal.AttachListFormatType[2];
+		attachDataFormatType = testJournal.attachListFormatType[2];
 		
 	}
 	
-	if (TestJournal.AttachListValue.size() > 2){
+	if (testJournal.attachListValue.size() > 2){
 		
-		AttachDataValue = TestJournal.AttachListValue[2];
+		attachDataValue = testJournal.attachListValue[2];
 		
 	}
 	
-	if (TestJournal.AttachListFormatType.size() > 2){
+	if (testJournal.attachListFormatType.size() > 2){
 		
-		AttachDataEncoding = TestJournal.AttachListEncoding[2];
+		attachDataEncoding = testJournal.attachListEncoding[2];
 		
 	}
 
-	if (TestJournal.AttachListTokens.size() > 2){
+	if (testJournal.attachListTokens.size() > 2){
 		
-		AttachDataTokens = TestJournal.AttachListTokens[2];
+		attachDataTokens = testJournal.attachListTokens[2];
 		
 	}
 	
-	ASSERT_EQ("VGhpcyBpcyBhbiBleGFtcGxlIGZpbGU=", AttachData);
-	ASSERT_EQ("text/plain", AttachDataFormatType);
-	ASSERT_EQ("BASE64", AttachDataEncoding);
-	ASSERT_EQ("BINARY", AttachDataValue);
-	ASSERT_EQ("STUPID=EXAMPLE", AttachDataTokens);
+	ASSERT_EQ("VGhpcyBpcyBhbiBleGFtcGxlIGZpbGU=", attachData);
+	ASSERT_EQ("text/plain", attachDataFormatType);
+	ASSERT_EQ("BASE64", attachDataEncoding);
+	ASSERT_EQ("BINARY", attachDataValue);
+	ASSERT_EQ("STUPID=EXAMPLE", attachDataTokens);
 	
 	// 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 (TestJournal.AttendeeList.begin() != TestJournal.AttendeeList.end()){
+	if (testJournal.attendeeList.begin() != testJournal.attendeeList.end()){
 		
-		AttendeeData = TestJournal.AttendeeList[0];
+		attendeeData = testJournal.attendeeList[0];
 		
 	}
 	
-	ASSERT_EQ("Attendee One", AttendeeData);
+	ASSERT_EQ("Attendee One", attendeeData);
 	
 	// Second ATTENDEE property.
 	
-	AttendeeData.clear();
+	attendeeData.clear();
 	
-	if (TestJournal.AttendeeList.size() > 1){
+	if (testJournal.attendeeList.size() > 1){
 		
-		AttendeeData = TestJournal.AttendeeList[1];
+		attendeeData = testJournal.attendeeList[1];
 		
 	}
 
-	if (TestJournal.AttendeeList.size() > 1){
+	if (testJournal.attendeeList.size() > 1){
 		
-		AttendeeDataDelegatedFrom = TestJournal.AttendeeListDelegatedFrom[1];
+		attendeeDataDelegatedFrom = testJournal.attendeeListDelegatedFrom[1];
 		
 	}
 	
-	if (TestJournal.AttendeeList.size() > 1){
+	if (testJournal.attendeeList.size() > 1){
 		
-		AttendeeDataDelegatedTo = TestJournal.AttendeeListDelegatedTo[1];
+		attendeeDataDelegatedTo = testJournal.attendeeListDelegatedTo[1];
 		
 	}
 
-	if (TestJournal.AttendeeList.size() > 1){
+	if (testJournal.attendeeList.size() > 1){
 		
-		AttendeeDataRole = TestJournal.AttendeeListRole[1];
+		attendeeDataRole = testJournal.attendeeListRole[1];
 		
 	}
 	
-	if (TestJournal.AttendeeList.size() > 1){
+	if (testJournal.attendeeList.size() > 1){
 		
-		AttendeeDataRSVP = TestJournal.AttendeeListRSVP[1];
+		attendeeDataRSVP = testJournal.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 (TestJournal.AttendeeList.size() > 2){
+	if (testJournal.attendeeList.size() > 2){
 		
-		AttendeeData = TestJournal.AttendeeList[2];
+		attendeeData = testJournal.attendeeList[2];
 		
 	}
 
-	if (TestJournal.AttendeeList.size() > 2){
+	if (testJournal.attendeeList.size() > 2){
 		
-		AttendeeDataDirectoryEntry = TestJournal.AttendeeListDirectoryEntry[2];
+		attendeeDataDirectoryEntry = testJournal.attendeeListDirectoryEntry[2];
 		
 	}
 	
-	if (TestJournal.AttendeeList.size() > 2){
+	if (testJournal.attendeeList.size() > 2){
 		
-		AttendeeDataSentBy = TestJournal.AttendeeListSentBy[2];
+		attendeeDataSentBy = testJournal.attendeeListSentBy[2];
 		
 	}
 
-	if (TestJournal.AttendeeList.size() > 2){
+	if (testJournal.attendeeList.size() > 2){
 		
-		AttendeeDataCommonName = TestJournal.AttendeeListCommonName[2];
+		attendeeDataCommonName = testJournal.attendeeListCommonName[2];
 		
 	}
 	
-	if (TestJournal.AttendeeList.size() > 2){
+	if (testJournal.attendeeList.size() > 2){
 		
-		AttendeeDataCalendarUserType = TestJournal.AttendeeListCalendarUserType[2];
+		attendeeDataCalendarUserType = testJournal.attendeeListCalendarUserType[2];
 		
 	}
 
-	if (TestJournal.AttendeeList.size() > 2){
+	if (testJournal.attendeeList.size() > 2){
 		
-		AttendeeDataParticipationStatus = TestJournal.AttendeeListParticipationStatus[2];
+		attendeeDataParticipationStatus = testJournal.attendeeListParticipationStatus[2];
 		
 	}
 
-	if (TestJournal.AttendeeList.size() > 2){
+	if (testJournal.attendeeList.size() > 2){
 		
-		AttendeeDataLanguage = TestJournal.AttendeeListLanguage[2];
+		attendeeDataLanguage = testJournal.attendeeListLanguage[2];
 		
 	}
 	
-	if (TestJournal.AttendeeList.size() > 2){
+	if (testJournal.attendeeList.size() > 2){
 		
-		AttendeeDataTokens = TestJournal.AttendeeListTokens[2];
+		attendeeDataTokens = testJournal.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 CATEGORIES.
 	
-	std::string CategoryData;
+	std::string categoryData;
 	
-	if (TestJournal.CategoriesList.begin() != TestJournal.CategoriesList.end()){
+	if (testJournal.categoriesList.begin() != testJournal.categoriesList.end()){
 		
-		CategoryData = TestJournal.CategoriesList[0];
+		categoryData = testJournal.categoriesList[0];
 		
 	}
 	
-	ASSERT_EQ("CATEGORY ONE, CATEGORY TWO", CategoryData);
+	ASSERT_EQ("CATEGORY ONE, CATEGORY TWO", categoryData);
 	
-	CategoryData.clear();
+	categoryData.clear();
 
-	std::string CategoryLanguage;
+	std::string categoryLanguage;
 	
 	// Get the second CATEGORIES.
 	
-	if (TestJournal.CategoriesList.size() > 1){
+	if (testJournal.categoriesList.size() > 1){
 		
-		CategoryData = TestJournal.CategoriesList[1];
+		categoryData = testJournal.categoriesList[1];
 		
 	}
 	
-	if (TestJournal.CategoriesList.size() > 1){
+	if (testJournal.categoriesList.size() > 1){
 		
-		CategoryLanguage = TestJournal.CategoriesListLanguage[1];
+		categoryLanguage = testJournal.categoriesListLanguage[1];
 		
 	}
 		
-	ASSERT_EQ("CATEGORY THREE, CATEGORY FOUR", CategoryData);
-	ASSERT_EQ("en", CategoryLanguage);
+	ASSERT_EQ("CATEGORY THREE, CATEGORY FOUR", categoryData);
+	ASSERT_EQ("en", categoryLanguage);
 	
-	CategoryData.clear();
-	CategoryLanguage.clear();
+	categoryData.clear();
+	categoryLanguage.clear();
 	
 	// Get the third CATEGORIES.
 	
-	std::string CategoryTokens;
+	std::string categoryTokens;
 	
-	if (TestJournal.CategoriesList.size() > 2){
+	if (testJournal.categoriesList.size() > 2){
 		
-		CategoryData = TestJournal.CategoriesList[2];
+		categoryData = testJournal.categoriesList[2];
 		
 	}
 	
-	if (TestJournal.CategoriesList.size() > 2){
+	if (testJournal.categoriesList.size() > 2){
 		
-		CategoryLanguage = TestJournal.CategoriesListLanguage[2];
+		categoryLanguage = testJournal.categoriesListLanguage[2];
 		
 	}
 	
-	if (TestJournal.CategoriesList.size() > 2){
+	if (testJournal.categoriesList.size() > 2){
 		
-		CategoryTokens = TestJournal.CategoriesListTokens[2];
+		categoryTokens = testJournal.categoriesListTokens[2];
 		
 	}
 		
-	ASSERT_EQ("CATEGORY FIVE, CATEGORY SIX, CATEGORY SEVEN", CategoryData);
-	ASSERT_EQ("en-GB", CategoryLanguage);
-	ASSERT_EQ("SAMPLE=TOKEN", CategoryTokens);
+	ASSERT_EQ("CATEGORY FIVE, CATEGORY SIX, CATEGORY SEVEN", categoryData);
+	ASSERT_EQ("en-GB", categoryLanguage);
+	ASSERT_EQ("SAMPLE=TOKEN", categoryTokens);
 	
 	// Get the first COMMENT.
 	
-	std::string CommentData;
+	std::string commentData;
 	
-	if (TestJournal.CommentList.begin() != TestJournal.CommentList.end()){
+	if (testJournal.commentList.begin() != testJournal.commentList.end()){
 		
-		CommentData = TestJournal.CommentList[0];
+		commentData = testJournal.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 (TestJournal.CommentList.size() > 1){
+	if (testJournal.commentList.size() > 1){
 		
-		CommentData = TestJournal.CommentList[1];
+		commentData = testJournal.commentList[1];
 		
 	}
 	
-	if (TestJournal.CommentList.size() > 1){
+	if (testJournal.commentList.size() > 1){
 		
-		CommentDataAltRep = TestJournal.CommentListAltRep[1];
+		commentDataAltRep = testJournal.commentListAltRep[1];
 		
 	}
 	
-	if (TestJournal.CommentList.size() > 1){
+	if (testJournal.commentList.size() > 1){
 		
-		CommentDataLanguage = TestJournal.CommentListLanguage[1];
+		commentDataLanguage = testJournal.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 (TestJournal.CommentList.size() > 2){
+	if (testJournal.commentList.size() > 2){
 		
-		CommentData = TestJournal.CommentList[2];
+		commentData = testJournal.commentList[2];
 		
 	}
 	
-	if (TestJournal.CommentList.size() > 2){
+	if (testJournal.commentList.size() > 2){
 		
-		CommentDataTokens = TestJournal.CommentListTokens[2];
+		commentDataTokens = testJournal.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 CONTACT.
 	
-	std::string ContactData;
+	std::string contactData;
 	
-	if (TestJournal.ContactList.begin() != TestJournal.ContactList.end()){
+	if (testJournal.contactList.begin() != testJournal.contactList.end()){
 		
-		ContactData = TestJournal.ContactList[0];
+		contactData = testJournal.contactList[0];
 		
 	}
 	
-	ASSERT_EQ("First Contact", ContactData);
+	ASSERT_EQ("First Contact", contactData);
 	
 	// Get the second CONTACT.
 	
-	ContactData.clear();
+	contactData.clear();
 	
-	std::string ContactDataAltRep;
-	std::string ContactDataLanguage;
+	std::string contactDataAltRep;
+	std::string contactDataLanguage;
 	
-	if (TestJournal.ContactList.size() > 1){
+	if (testJournal.contactList.size() > 1){
 		
-		ContactData = TestJournal.ContactList[1];
+		contactData = testJournal.contactList[1];
 		
 	}
 	
-	if (TestJournal.ContactList.size() > 1){
+	if (testJournal.contactList.size() > 1){
 		
-		ContactDataAltRep = TestJournal.ContactListAltRep[1];
+		contactDataAltRep = testJournal.contactListAltRep[1];
 		
 	}
 	
-	if (TestJournal.ContactList.size() > 1){
+	if (testJournal.contactList.size() > 1){
 		
-		ContactDataLanguage = TestJournal.ContactListLanguage[1];
+		contactDataLanguage = testJournal.contactListLanguage[1];
 		
 	}
 	
-	ASSERT_EQ("Second Contact", ContactData);
-	ASSERT_EQ("null:nodata", ContactDataAltRep);
-	ASSERT_EQ("en-GB", ContactDataLanguage);
+	ASSERT_EQ("Second Contact", contactData);
+	ASSERT_EQ("null:nodata", contactDataAltRep);
+	ASSERT_EQ("en-GB", contactDataLanguage);
 	
 	// Get the third CONTACT.
 	
-	ContactData.clear();
+	contactData.clear();
 	
-	std::string ContactDataTokens;
+	std::string contactDataTokens;
 	
-	if (TestJournal.ContactList.size() > 2){
+	if (testJournal.contactList.size() > 2){
 		
-		ContactData = TestJournal.ContactList[2];
+		contactData = testJournal.contactList[2];
 		
 	}
 	
-	if (TestJournal.ContactList.size() > 2){
+	if (testJournal.contactList.size() > 2){
 		
-		ContactDataTokens = TestJournal.ContactListTokens[2];
+		contactDataTokens = testJournal.contactListTokens[2];
 		
 	}
 	
-	ASSERT_EQ("Third Contact", ContactData);
-	ASSERT_EQ("ZEBRAS=NO", ContactDataTokens);
+	ASSERT_EQ("Third Contact", contactData);
+	ASSERT_EQ("ZEBRAS=NO", contactDataTokens);
 	
 	// Get the first DESCRIPTION.
 	
-	std::string DescriptionData;
+	std::string descriptionData;
 	
-	if (TestJournal.DescriptionList.begin() != TestJournal.DescriptionList.end()){
+	if (testJournal.descriptionList.begin() != testJournal.descriptionList.end()){
 		
-		DescriptionData = TestJournal.DescriptionList[0];
+		descriptionData = testJournal.descriptionList[0];
 		
 	}
 	
-	ASSERT_EQ("First Journal Entry Description", DescriptionData);
+	ASSERT_EQ("First Journal Entry Description", descriptionData);
 	
 	// Get the second DESCRIPTION.
 	
-	DescriptionData.clear();
+	descriptionData.clear();
 	
-	std::string DescriptionAltRep;
-	std::string DescriptionLanguage;
+	std::string descriptionAltRep;
+	std::string descriptionLanguage;
 	
-	if (TestJournal.DescriptionList.size() > 1){
+	if (testJournal.descriptionList.size() > 1){
 		
-		DescriptionData = TestJournal.DescriptionList[1];
+		descriptionData = testJournal.descriptionList[1];
 		
 	}
 	
-	if (TestJournal.DescriptionList.size() > 1){
+	if (testJournal.descriptionList.size() > 1){
 		
-		DescriptionAltRep = TestJournal.DescriptionListAltRep[1];
+		descriptionAltRep = testJournal.descriptionListAltRep[1];
 		
 	}
 	
-	if (TestJournal.DescriptionList.size() > 1){
+	if (testJournal.descriptionList.size() > 1){
 		
-		DescriptionLanguage = TestJournal.DescriptionListLanguage[1];
+		descriptionLanguage = testJournal.descriptionListLanguage[1];
 		
 	}
 	
-	ASSERT_EQ("This is the second journal description.", DescriptionData);
-	ASSERT_EQ("null:nodata", DescriptionAltRep);
-	ASSERT_EQ("en-GB", DescriptionLanguage);
+	ASSERT_EQ("This is the second journal description.", descriptionData);
+	ASSERT_EQ("null:nodata", descriptionAltRep);
+	ASSERT_EQ("en-GB", descriptionLanguage);
 	
 	// Get the third DESCRIPTION.
 	
-	DescriptionData.clear();
+	descriptionData.clear();
 	
-	std::string DescriptionDataTokens;
+	std::string descriptionDataTokens;
 	
-	if (TestJournal.DescriptionList.size() > 2){
+	if (testJournal.descriptionList.size() > 2){
 		
-		DescriptionData = TestJournal.DescriptionList[2];
+		descriptionData = testJournal.descriptionList[2];
 		
 	}
 	
-	if (TestJournal.DescriptionList.size() > 2){
+	if (testJournal.descriptionList.size() > 2){
 		
-		DescriptionDataTokens = TestJournal.DescriptionListTokens[2];
+		descriptionDataTokens = testJournal.descriptionListTokens[2];
 		
 	}
 	
-	ASSERT_EQ("This is the third journal description.", DescriptionData);
-	ASSERT_EQ("ZEBRAS=NO", DescriptionDataTokens);
+	ASSERT_EQ("This is the third journal description.", descriptionData);
+	ASSERT_EQ("ZEBRAS=NO", descriptionDataTokens);
 	
 	// Get the first EXDATE.
 	
-	std::string ExcludeDate;
+	std::string excludeDate;
 	
-	if (TestJournal.ExcludeDateData.begin() != TestJournal.ExcludeDateData.end()){
+	if (testJournal.excludeDateData.begin() != testJournal.excludeDateData.end()){
 		
-		ExcludeDate = TestJournal.ExcludeDateData[0];
+		excludeDate = testJournal.excludeDateData[0];
 		
 	}
 	
-	ASSERT_EQ("20160125T120000Z", ExcludeDate);
+	ASSERT_EQ("20160125T120000Z", excludeDate);
 	
 	// Get the second EXDATE.
 
-	ExcludeDate.clear();
+	excludeDate.clear();
 	
-	std::string ExcludeDataTimeZoneParam;
-	std::string ExcludeDataValue;
+	std::string excludeDataTimeZoneParam;
+	std::string excludeDataValue;
 	
-	if (TestJournal.ContactList.size() > 1){
+	if (testJournal.contactList.size() > 1){
 		
-		ExcludeDate = TestJournal.ExcludeDateData[1];
+		excludeDate = testJournal.excludeDateData[1];
 		
 	}
 	
-	if (TestJournal.ContactList.size() > 1){
+	if (testJournal.contactList.size() > 1){
 		
-		ExcludeDataTimeZoneParam = TestJournal.ExcludeDateDataTimeZoneParam[1];
+		excludeDataTimeZoneParam = testJournal.excludeDateDataTimeZoneParam[1];
 		
 	}
 	
-	if (TestJournal.ContactList.size() > 1){
+	if (testJournal.contactList.size() > 1){
 		
-		ExcludeDataValue = TestJournal.ExcludeDateDataValue[1];
+		excludeDataValue = testJournal.excludeDateDataValue[1];
 		
 	}
 	
-	ASSERT_EQ("20160125T130000Z", ExcludeDate);
-	ASSERT_EQ("DATE-TIME", ExcludeDataValue);
-	ASSERT_EQ("Europe/Truro", ExcludeDataTimeZoneParam);
+	ASSERT_EQ("20160125T130000Z", excludeDate);
+	ASSERT_EQ("DATE-TIME", excludeDataValue);
+	ASSERT_EQ("Europe/Truro", excludeDataTimeZoneParam);
 	
 	// Get the third EXDATE.
 	
-	ExcludeDate.clear();
+	excludeDate.clear();
 	
-	std::string ExcludeDataTokens;
+	std::string excludeDataTokens;
 	
-	if (TestJournal.ContactList.size() > 2){
+	if (testJournal.contactList.size() > 2){
 		
-		ExcludeDate = TestJournal.ExcludeDateData[2];
+		excludeDate = testJournal.excludeDateData[2];
 		
 	}
 	
-	if (TestJournal.ContactList.size() > 2){
+	if (testJournal.contactList.size() > 2){
 		
-		ExcludeDataTokens = TestJournal.ExcludeDateDataTokens[2];
+		excludeDataTokens = testJournal.excludeDateDataTokens[2];
 		
 	}
 	
-	ASSERT_EQ("20160125T133000Z", ExcludeDate);
-	ASSERT_EQ("ZOOP=ZIPPO", ExcludeDataTokens);
+	ASSERT_EQ("20160125T133000Z", excludeDate);
+	ASSERT_EQ("ZOOP=ZIPPO", excludeDataTokens);
 	
 	// Get the first RELATED-TO.
 	
-	std::string RelatedTo;
+	std::string relatedTo;
 	
-	if (TestJournal.RelatedToData.begin() != TestJournal.RelatedToData.end()){
+	if (testJournal.relatedToData.begin() != testJournal.relatedToData.end()){
 		
-		RelatedTo = TestJournal.RelatedToData[0];
+		relatedTo = testJournal.relatedToData[0];
 		
 	}
 	
-	ASSERT_EQ("person.1@example.com", RelatedTo);
+	ASSERT_EQ("person.1@example.com", relatedTo);
 	
 	// Get the second RELATED-TO.
 	
-	RelatedTo.clear();
+	relatedTo.clear();
 	
-	std::string RelatedToType;
+	std::string relatedToType;
 	
-	if (TestJournal.RelatedToData.size() > 1){
+	if (testJournal.relatedToData.size() > 1){
 		
-		RelatedTo = TestJournal.RelatedToData[1];
+		relatedTo = testJournal.relatedToData[1];
 		
 	}
 	
-	if (TestJournal.RelatedToData.size() > 1){
+	if (testJournal.relatedToData.size() > 1){
 		
-		RelatedToType = TestJournal.RelatedToDataRelationType[1];
+		relatedToType = testJournal.relatedToDataRelationType[1];
 		
 	}
 	
-	ASSERT_EQ("person.2@example.com", RelatedTo);
-	ASSERT_EQ("PARENT", RelatedToType);
+	ASSERT_EQ("person.2@example.com", relatedTo);
+	ASSERT_EQ("PARENT", relatedToType);
 	
 	// Get the third RELATED-TO.
 	
-	RelatedTo.clear();
+	relatedTo.clear();
 	
-	std::string RelatedToTokens;
+	std::string relatedToTokens;
 	
-	if (TestJournal.RelatedToData.size() > 2){
+	if (testJournal.relatedToData.size() > 2){
 		
-		RelatedTo = TestJournal.RelatedToData[2];
+		relatedTo = testJournal.relatedToData[2];
 		
 	}
 	
-	if (TestJournal.RelatedToData.size() > 2){
+	if (testJournal.relatedToData.size() > 2){
 		
-		RelatedToTokens = TestJournal.RelatedToDataTokens[2];
+		relatedToTokens = testJournal.relatedToDataTokens[2];
 		
 	}
 	
-	ASSERT_EQ("person.3@example.com", RelatedTo);
-	ASSERT_EQ("SCHOOL=MEETING", RelatedToTokens);
+	ASSERT_EQ("person.3@example.com", relatedTo);
+	ASSERT_EQ("SCHOOL=MEETING", relatedToTokens);
 	
 	// Get the first RDATE.
 
-	std::string RecurrenceDate;
+	std::string recurrenceDate;
 	
-	if (TestJournal.RecurranceDateData.begin() != TestJournal.RecurranceDateData.end()){
+	if (testJournal.RecurranceDateData.begin() != testJournal.RecurranceDateData.end()){
 		
-		RecurrenceDate = TestJournal.RecurranceDateData[0];
+		recurrenceDate = testJournal.RecurranceDateData[0];
 		
 	}
 	
-	ASSERT_EQ("20160120", RecurrenceDate);
+	ASSERT_EQ("20160120", recurrenceDate);
 	
 	// Get the second RDATE.
 	
-	RecurrenceDate.clear();
+	recurrenceDate.clear();
 	
-	std::string RecurrenceDateTimeZoneParam;
-	std::string RecurrenceDateValue;
+	std::string recurrenceDateTimeZoneParam;
+	std::string recurrenceDateValue;
 	
-	if (TestJournal.RecurranceDateData.size() > 1){
+	if (testJournal.RecurranceDateData.size() > 1){
 		
-		RecurrenceDate = TestJournal.RecurranceDateData[1];
+		recurrenceDate = testJournal.RecurranceDateData[1];
 		
 	}
 	
-	if (TestJournal.RecurranceDateData.size() > 1){
+	if (testJournal.RecurranceDateData.size() > 1){
 		
-		RecurrenceDateTimeZoneParam = TestJournal.RecurranceDateDataTimeZoneParam[1];
+		recurrenceDateTimeZoneParam = testJournal.RecurranceDateDataTimeZoneParam[1];
 		
 	}
 	
-	if (TestJournal.RecurranceDateData.size() > 1){
+	if (testJournal.RecurranceDateData.size() > 1){
 		
-		RecurrenceDateValue = TestJournal.RecurranceDateDataValue[1];
+		recurrenceDateValue = testJournal.RecurranceDateDataValue[1];
 		
 	}
 	
-	ASSERT_EQ("20160121", RecurrenceDate);
-	ASSERT_EQ("DATE", RecurrenceDateValue);
-	ASSERT_EQ("Europe/Truro", RecurrenceDateTimeZoneParam);
+	ASSERT_EQ("20160121", recurrenceDate);
+	ASSERT_EQ("DATE", recurrenceDateValue);
+	ASSERT_EQ("Europe/Truro", recurrenceDateTimeZoneParam);
 	
 	// Get the third RDATE.
 	
-	RecurrenceDate.clear();
+	recurrenceDate.clear();
 	
 	std::string RecurrenceTokens;
 	
-	if (TestJournal.RecurranceDateData.size() > 2){
+	if (testJournal.RecurranceDateData.size() > 2){
 		
-		RecurrenceDate = TestJournal.RecurranceDateData[2];
+		recurrenceDate = testJournal.RecurranceDateData[2];
 		
 	}
 	
-	if (TestJournal.RecurranceDateData.size() > 2){
+	if (testJournal.RecurranceDateData.size() > 2){
 		
-		RecurrenceTokens = TestJournal.RecurranceDateDataTokens[2];
+		RecurrenceTokens = testJournal.RecurranceDateDataTokens[2];
 		
 	}
 	
-	ASSERT_EQ("20160520", RecurrenceDate);
+	ASSERT_EQ("20160520", recurrenceDate);
 	ASSERT_EQ("ZILCH=DATA", RecurrenceTokens);
 
 	// Get the first REQUEST-STATUS.
 
-	std::string RequestStatus;
+	std::string requestStatus;
 	
-	if (TestJournal.RequestStatusData.begin() != TestJournal.RequestStatusData.end()){
+	if (testJournal.requestStatusData.begin() != testJournal.requestStatusData.end()){
 		
-		RequestStatus = TestJournal.RequestStatusData[0];
+		requestStatus = testJournal.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 (TestJournal.ContactList.size() > 1){
+	if (testJournal.contactList.size() > 1){
 		
-		RequestStatus = TestJournal.RequestStatusData[1];
+		requestStatus = testJournal.requestStatusData[1];
 		
 	}
 	
-	if (TestJournal.ContactList.size() > 1){
+	if (testJournal.contactList.size() > 1){
 		
-		RequestLanguage = TestJournal.RequestStatusLanguage[1];
+		requestLanguage = testJournal.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 (TestJournal.ContactList.size() > 2){
+	if (testJournal.contactList.size() > 2){
 		
-		RequestStatus = TestJournal.RequestStatusData[2];
+		requestStatus = testJournal.requestStatusData[2];
 		
 	}
 	
-	if (TestJournal.ContactList.size() > 2){
+	if (testJournal.contactList.size() > 2){
 		
-		RequestTokens = TestJournal.RequestStatusTokens[2];
+		requestTokens = testJournal.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 (TestJournal.XTokensData.size() != 0 ){
+	if (testJournal.xTokensData.size() != 0 ){
 	
-		XTokenData = TestJournal.XTokensData[0];
+		xTokenData = testJournal.xTokensData[0];
 		
 	}
 
-	if (TestJournal.XTokensData.size() != 0){
+	if (testJournal.xTokensData.size() != 0){
 	
-		XTokenName = TestJournal.XTokensDataTokens[0];
+		xTokenName = testJournal.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 (TestJournal.XTokensData.size() > 1){
+	if (testJournal.xTokensData.size() > 1){
 	
-		XTokenData = TestJournal.XTokensData[1];
+		xTokenData = testJournal.xTokensData[1];
 		
 	}
 
-	if (TestJournal.XTokensData.size() > 1){
+	if (testJournal.xTokensData.size() > 1){
 	
-		XTokenName = TestJournal.XTokensDataTokens[1];
+		xTokenName = testJournal.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 (TestJournal.XTokensData.size() > 2){
+	if (testJournal.xTokensData.size() > 2){
 	
-		XTokenData = TestJournal.XTokensData[2];
+		xTokenData = testJournal.xTokensData[2];
 		
 	}
 
-	if (TestJournal.XTokensData.size() > 2){
+	if (testJournal.xTokensData.size() > 2){
 	
-		XTokenName = TestJournal.XTokensDataTokens[2];
+		xTokenName = testJournal.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 (TestJournal.XTokensData.size() > 3){
+	if (testJournal.xTokensData.size() > 3){
 	
-		XTokenData = TestJournal.XTokensData[3];
+		xTokenData = testJournal.xTokensData[3];
 		
 	}
 
-	if (TestJournal.XTokensData.size() > 3){
+	if (testJournal.xTokensData.size() > 3){
 	
-		XTokenName = TestJournal.XTokensDataTokens[3];
+		xTokenName = testJournal.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 (TestJournal.XTokensData.size() > 4){
+	if (testJournal.xTokensData.size() > 4){
 	
-		XTokenData = TestJournal.XTokensData[4];
+		xTokenData = testJournal.xTokensData[4];
 		
 	}
 
-	if (TestJournal.XTokensData.size() > 4){
+	if (testJournal.xTokensData.size() > 4){
 	
-		XTokenName = TestJournal.XTokensDataTokens[4];
+		xTokenName = testJournal.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 (TestJournal.XTokensData.size() > 5){
+	if (testJournal.xTokensData.size() > 5){
 	
-		XTokenData = TestJournal.XTokensData[5];
+		xTokenData = testJournal.xTokensData[5];
 		
 	}
 
-	if (TestJournal.XTokensData.size() > 5){
+	if (testJournal.xTokensData.size() > 5){
 	
-		XTokenName = TestJournal.XTokensDataTokens[5];
+		xTokenName = testJournal.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 (TestJournal.XTokensData.size() > 6){
+	if (testJournal.xTokensData.size() > 6){
 	
-		XTokenData = TestJournal.XTokensData[6];
+		xTokenData = testJournal.xTokensData[6];
 		
 	}
 
-	if (TestJournal.XTokensData.size() > 6){
+	if (testJournal.xTokensData.size() > 6){
 	
-		XTokenName = TestJournal.XTokensDataTokens[6];
+		xTokenName = testJournal.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 (TestJournal.XTokensData.size() > 7){
+	if (testJournal.xTokensData.size() > 7){
 	
-		XTokenData = TestJournal.XTokensData[7];
+		xTokenData = testJournal.xTokensData[7];
 		
 	}
 
-	if (TestJournal.XTokensData.size() > 7){
+	if (testJournal.xTokensData.size() > 7){
 	
-		XTokenName = TestJournal.XTokensDataTokens[7];
+		xTokenName = testJournal.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 (TestJournal.XTokensData.size() > 8){
+	if (testJournal.xTokensData.size() > 8){
 	
-		XTokenData = TestJournal.XTokensData[8];
+		xTokenData = testJournal.xTokensData[8];
 		
 	}
 
-	if (TestJournal.XTokensData.size() > 8){
+	if (testJournal.xTokensData.size() > 8){
 	
-		XTokenName = TestJournal.XTokensDataTokens[8];
+		xTokenName = testJournal.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