X-Git-Url: http://Server1/repobrowser/?p=xestiacalendar%2F.git;a=blobdiff_plain;f=source%2Ftests%2Fxestiacalendar_icaltaskload.h;h=2fb47881e35ca66341fa461d0cfffced181bdfb0;hp=439ba4eb42d29f94532f479532644bd88a2f9999;hb=1fe6e43892e5c572949a293a9e19704b5debadad;hpb=2e304ff435c80c07daaf0d3fbe8a9ab7d1ae70b1

diff --git a/source/tests/xestiacalendar_icaltaskload.h b/source/tests/xestiacalendar_icaltaskload.h
index 439ba4e..2fb4788 100644
--- a/source/tests/xestiacalendar_icaltaskload.h
+++ b/source/tests/xestiacalendar_icaltaskload.h
@@ -1066,54 +1066,54 @@ TEST(iCalendarTask, AlarmTests){
 	
 	// Tests for the first VALARM property.
 	
-	std::string ActionData;
-	std::string ActionDataTokens;
+	std::string actionData;
+	std::string actionDataTokens;
 	
-	std::string TriggerData;
-	std::string TriggerRelated;
-	std::string TriggerValue;
-	std::string TriggerTokens;
+	std::string triggerData;
+	std::string triggerRelated;
+	std::string triggerValue;
+	std::string triggerTokens;
 	
-	std::string DurationData;
-	std::string DurationTokens;
+	std::string durationData;
+	std::string durationTokens;
 	
-	std::string RepeatData;
-	std::string RepeatTokens;
+	std::string repeatData;
+	std::string repeatTokens;
 	
 	std::string xTokenData;
 	std::string xTokenName;
 	
 	if (testTask.calendarAlarmData.size() > 0){
 	
-		ActionData = testTask.calendarAlarmData[0].AlarmAction;
-		ActionDataTokens = testTask.calendarAlarmData[0].AlarmActionTokens;
+		actionData = testTask.calendarAlarmData[0].alarmAction;
+		actionDataTokens = testTask.calendarAlarmData[0].alarmActionTokens;
 		
-		TriggerData = testTask.calendarAlarmData[0].TriggerData;
-		TriggerRelated = testTask.calendarAlarmData[0].TriggerRelated;
-		TriggerValue = testTask.calendarAlarmData[0].TriggerValue;
-		TriggerTokens = testTask.calendarAlarmData[0].TriggerTokens;
+		triggerData = testTask.calendarAlarmData[0].triggerData;
+		triggerRelated = testTask.calendarAlarmData[0].triggerRelated;
+		triggerValue = testTask.calendarAlarmData[0].triggerValue;
+		triggerTokens = testTask.calendarAlarmData[0].triggerTokens;
 		
-		DurationData = testTask.calendarAlarmData[0].DurationData;
-		DurationTokens = testTask.calendarAlarmData[0].DurationTokens;
+		durationData = testTask.calendarAlarmData[0].durationData;
+		durationTokens = testTask.calendarAlarmData[0].durationTokens;
 		
-		RepeatData = testTask.calendarAlarmData[0].RepeatData;
-		RepeatTokens = testTask.calendarAlarmData[0].RepeatTokens;
+		repeatData = testTask.calendarAlarmData[0].repeatData;
+		repeatTokens = testTask.calendarAlarmData[0].repeatTokens;
 		
 	}
 	
-	ASSERT_EQ("AUDIO", ActionData);
-	ASSERT_EQ("FUNKY=SOUNDS", ActionDataTokens);
+	ASSERT_EQ("AUDIO", actionData);
+	ASSERT_EQ("FUNKY=SOUNDS", actionDataTokens);
 	
-	ASSERT_EQ("20160220T160000Z", TriggerData);
-	ASSERT_EQ("END", TriggerRelated);
-	ASSERT_EQ("DATE-TIME", TriggerValue);
-	ASSERT_EQ("PUSH=BUTTON", TriggerTokens);
+	ASSERT_EQ("20160220T160000Z", triggerData);
+	ASSERT_EQ("END", triggerRelated);
+	ASSERT_EQ("DATE-TIME", triggerValue);
+	ASSERT_EQ("PUSH=BUTTON", triggerTokens);
 
-	ASSERT_EQ("PT5H", DurationData);
-	ASSERT_EQ("FLYING=NO", DurationTokens);
+	ASSERT_EQ("PT5H", durationData);
+	ASSERT_EQ("FLYING=NO", durationTokens);
 
-	ASSERT_EQ("PT5M", RepeatData);
-	ASSERT_EQ("NEVER=SLEEP", RepeatTokens);
+	ASSERT_EQ("PT5M", repeatData);
+	ASSERT_EQ("NEVER=SLEEP", repeatTokens);
 	
 	// Tests for ATTACH. First ATTACH property.
 
@@ -1248,19 +1248,19 @@ TEST(iCalendarTask, AlarmTests){
 	
 	// Tests for the second VALARM property.
 	
-	ActionData.clear();
-	ActionDataTokens.clear();
+	actionData.clear();
+	actionDataTokens.clear();
 	
-	TriggerData.clear();
-	TriggerRelated.clear();
-	TriggerValue.clear();
-	TriggerTokens.clear();
+	triggerData.clear();
+	triggerRelated.clear();
+	triggerValue.clear();
+	triggerTokens.clear();
 	
-	DurationData.clear();
-	DurationTokens.clear();
+	durationData.clear();
+	durationTokens.clear();
 	
-	RepeatData.clear();
-	RepeatTokens.clear();
+	repeatData.clear();
+	repeatTokens.clear();
 	
 	xTokenData.clear();
 	xTokenName.clear();
@@ -1272,19 +1272,19 @@ TEST(iCalendarTask, AlarmTests){
 	
 	if (testTask.calendarAlarmData.size() > 1){
 		
-		ActionData = testTask.calendarAlarmData[1].AlarmAction;
-		ActionDataTokens = testTask.calendarAlarmData[1].AlarmActionTokens;
+		actionData = testTask.calendarAlarmData[1].alarmAction;
+		actionDataTokens = testTask.calendarAlarmData[1].alarmActionTokens;
 		
-		TriggerData = testTask.calendarAlarmData[1].TriggerData;
-		TriggerRelated = testTask.calendarAlarmData[1].TriggerRelated;
-		TriggerValue = testTask.calendarAlarmData[1].TriggerValue;
-		TriggerTokens = testTask.calendarAlarmData[1].TriggerTokens;
+		triggerData = testTask.calendarAlarmData[1].triggerData;
+		triggerRelated = testTask.calendarAlarmData[1].triggerRelated;
+		triggerValue = testTask.calendarAlarmData[1].triggerValue;
+		triggerTokens = testTask.calendarAlarmData[1].triggerTokens;
 		
-		DurationData = testTask.calendarAlarmData[1].DurationData;
-		DurationTokens = testTask.calendarAlarmData[1].DurationTokens;
+		durationData = testTask.calendarAlarmData[1].durationData;
+		durationTokens = testTask.calendarAlarmData[1].durationTokens;
 		
-		RepeatData = testTask.calendarAlarmData[1].RepeatData;
-		RepeatTokens = testTask.calendarAlarmData[1].RepeatTokens;
+		repeatData = testTask.calendarAlarmData[1].repeatData;
+		repeatTokens = testTask.calendarAlarmData[1].repeatTokens;
 		
 		descriptionData = testTask.calendarAlarmData[1].descriptionData;
 		descriptionAltRep = testTask.calendarAlarmData[1].descriptionAltRep;
@@ -1293,19 +1293,19 @@ TEST(iCalendarTask, AlarmTests){
 		
 	}
 	
-	ASSERT_EQ("DISPLAY", ActionData);
-	ASSERT_EQ("FLASHING=LIGHTS", ActionDataTokens);
+	ASSERT_EQ("DISPLAY", actionData);
+	ASSERT_EQ("FLASHING=LIGHTS", actionDataTokens);
 	
-	ASSERT_EQ("20160230T110000Z", TriggerData);
-	ASSERT_EQ("END", TriggerRelated);
-	ASSERT_EQ("DATE-TIME", TriggerValue);
-	ASSERT_EQ("PUSH=BUTTON", TriggerTokens);
+	ASSERT_EQ("20160230T110000Z", triggerData);
+	ASSERT_EQ("END", triggerRelated);
+	ASSERT_EQ("DATE-TIME", triggerValue);
+	ASSERT_EQ("PUSH=BUTTON", triggerTokens);
 
-	ASSERT_EQ("PT7H", DurationData);
-	ASSERT_EQ("FLYING=YES", DurationTokens);
+	ASSERT_EQ("PT7H", durationData);
+	ASSERT_EQ("FLYING=YES", durationTokens);
 
-	ASSERT_EQ("PT3M", RepeatData);
-	ASSERT_EQ("SLEEP=ALWAYS", RepeatTokens);
+	ASSERT_EQ("PT3M", repeatData);
+	ASSERT_EQ("SLEEP=ALWAYS", repeatTokens);
 	
 	ASSERT_EQ("This is the second alarm.", descriptionData);
 	ASSERT_EQ("null:nodata", descriptionAltRep);
@@ -1356,19 +1356,19 @@ TEST(iCalendarTask, AlarmTests){
 	
 	// Tests for the third VALARM property.
 	
-	ActionData.clear();
-	ActionDataTokens.clear();
+	actionData.clear();
+	actionDataTokens.clear();
 	
-	TriggerData.clear();
-	TriggerRelated.clear();
-	TriggerValue.clear();
-	TriggerTokens.clear();
+	triggerData.clear();
+	triggerRelated.clear();
+	triggerValue.clear();
+	triggerTokens.clear();
 	
-	DurationData.clear();
-	DurationTokens.clear();
+	durationData.clear();
+	durationTokens.clear();
 	
-	RepeatData.clear();
-	RepeatTokens.clear();
+	repeatData.clear();
+	repeatTokens.clear();
 	
 	xTokenData.clear();
 	xTokenName.clear();
@@ -1378,10 +1378,10 @@ TEST(iCalendarTask, AlarmTests){
 	descriptionLanguage.clear();
 	descriptionTokens.clear();
 
-	string SummaryData;
-	string SummaryAltRep;
-	string SummaryLanguage;
-	string SummaryTokens;
+	string summaryData;
+	string summaryAltRep;
+	string summaryLanguage;
+	string summaryTokens;
 	
 	string attendeeDataMember;
 	string attendeeDataDelegatedFrom;
@@ -1405,55 +1405,55 @@ TEST(iCalendarTask, AlarmTests){
 	
 	if (testTask.calendarAlarmData.size() > 2){
 		
-		ActionData = testTask.calendarAlarmData[2].AlarmAction;
-		ActionDataTokens = testTask.calendarAlarmData[2].AlarmActionTokens;
+		actionData = testTask.calendarAlarmData[2].alarmAction;
+		actionDataTokens = testTask.calendarAlarmData[2].alarmActionTokens;
 		
-		TriggerData = testTask.calendarAlarmData[2].TriggerData;
-		TriggerRelated = testTask.calendarAlarmData[2].TriggerRelated;
-		TriggerValue = testTask.calendarAlarmData[2].TriggerValue;
-		TriggerTokens = testTask.calendarAlarmData[2].TriggerTokens;
+		triggerData = testTask.calendarAlarmData[2].triggerData;
+		triggerRelated = testTask.calendarAlarmData[2].triggerRelated;
+		triggerValue = testTask.calendarAlarmData[2].triggerValue;
+		triggerTokens = testTask.calendarAlarmData[2].triggerTokens;
 		
-		DurationData = testTask.calendarAlarmData[2].DurationData;
-		DurationTokens = testTask.calendarAlarmData[2].DurationTokens;
+		durationData = testTask.calendarAlarmData[2].durationData;
+		durationTokens = testTask.calendarAlarmData[2].durationTokens;
 		
-		RepeatData = testTask.calendarAlarmData[2].RepeatData;
-		RepeatTokens = testTask.calendarAlarmData[2].RepeatTokens;
+		repeatData = testTask.calendarAlarmData[2].repeatData;
+		repeatTokens = testTask.calendarAlarmData[2].repeatTokens;
 		
 		descriptionData = testTask.calendarAlarmData[2].descriptionData;
 		descriptionAltRep = testTask.calendarAlarmData[2].descriptionAltRep;
 		descriptionLanguage = testTask.calendarAlarmData[2].descriptionLanguage;
 		descriptionTokens = testTask.calendarAlarmData[2].descriptionTokens;
 		
-		SummaryData = testTask.calendarAlarmData[2].SummaryData;
-		SummaryAltRep = testTask.calendarAlarmData[2].SummaryAltRep;
-		SummaryLanguage = testTask.calendarAlarmData[2].SummaryLanguage;
-		SummaryTokens = testTask.calendarAlarmData[2].SummaryTokens;
+		summaryData = testTask.calendarAlarmData[2].summaryData;
+		summaryAltRep = testTask.calendarAlarmData[2].summaryAltRep;
+		summaryLanguage = testTask.calendarAlarmData[2].summaryLanguage;
+		summaryTokens = testTask.calendarAlarmData[2].summaryTokens;
 		
 	}
 	
-	ASSERT_EQ("EMAIL", ActionData);
-	ASSERT_EQ("FLASHING=LIGHTS", ActionDataTokens);
+	ASSERT_EQ("EMAIL", actionData);
+	ASSERT_EQ("FLASHING=LIGHTS", actionDataTokens);
 	
-	ASSERT_EQ("20160230T120000Z", TriggerData);
-	ASSERT_EQ("END", TriggerRelated);
-	ASSERT_EQ("DATE-TIME", TriggerValue);
-	ASSERT_EQ("PUSH=BUTTON", TriggerTokens);
+	ASSERT_EQ("20160230T120000Z", triggerData);
+	ASSERT_EQ("END", triggerRelated);
+	ASSERT_EQ("DATE-TIME", triggerValue);
+	ASSERT_EQ("PUSH=BUTTON", triggerTokens);
 
-	ASSERT_EQ("PT7H", DurationData);
-	ASSERT_EQ("FLYING=YES", DurationTokens);
+	ASSERT_EQ("PT7H", durationData);
+	ASSERT_EQ("FLYING=YES", durationTokens);
 
-	ASSERT_EQ("PT3M", RepeatData);
-	ASSERT_EQ("SLEEP=ALWAYS", RepeatTokens);
+	ASSERT_EQ("PT3M", repeatData);
+	ASSERT_EQ("SLEEP=ALWAYS", repeatTokens);
 	
 	ASSERT_EQ("This is the third alarm.", descriptionData);
 	ASSERT_EQ("null:nodata", descriptionAltRep);
 	ASSERT_EQ("kw", descriptionLanguage);
 	ASSERT_EQ("TERRIBLE=TOKEN", descriptionTokens);
 
-	ASSERT_EQ("This is the summary of the third alarm.", SummaryData);
-	ASSERT_EQ("null:nodata", SummaryAltRep);
-	ASSERT_EQ("en", SummaryLanguage);
-	ASSERT_EQ("MEEP=MOOP", SummaryTokens);
+	ASSERT_EQ("This is the summary of the third alarm.", summaryData);
+	ASSERT_EQ("null:nodata", summaryAltRep);
+	ASSERT_EQ("en", summaryLanguage);
+	ASSERT_EQ("MEEP=MOOP", summaryTokens);
 
 	// Tests for ATTENDEE. First ATTENDEE property.