camelCase: Converted code in tests directory

[xestiacalendar/.git] / source / tests / xestiacalendar_icaltimezoneload.h

diff --git a/source/tests/xestiacalendar_icaltimezoneload.h b/source/tests/xestiacalendar_icaltimezoneload.h
index 693483b..7244966 100644 (file)
--- a/source/tests/xestiacalendar_icaltimezoneload.h
+++ b/source/tests/xestiacalendar_icaltimezoneload.h
@@ -20,639 +20,639 @@
 
 TEST(iCalendarTimezone, BasicTests){
 
-       CalendarTimezoneObject TestTimezone;
+       CalendarTimezoneObject testTimezone;
        
-       ASSERT_EQ(CALENDAROBJECTLOAD_MISSING, TestTimezone.LoadFile("iCalendarTimezone-Missing.vcf"));
-       ASSERT_EQ(CALENDAROBJECTLOAD_CANNOTOPEN, TestTimezone.LoadFile("iCalendarTimezone-InvalidPermissions.vcf"));
-       ASSERT_EQ(CALENDAROBJECTLOAD_OK, TestTimezone.LoadFile("iCalendarTimezone-Load1.vcf"));
+       ASSERT_EQ(CALENDAROBJECTLOAD_MISSING, testTimezone.LoadFile("iCalendarTimezone-Missing.vcf"));
+       ASSERT_EQ(CALENDAROBJECTLOAD_CANNOTOPEN, testTimezone.LoadFile("iCalendarTimezone-InvalidPermissions.vcf"));
+       ASSERT_EQ(CALENDAROBJECTLOAD_OK, testTimezone.LoadFile("iCalendarTimezone-Load1.vcf"));
        
 }
 
 TEST(iCalendarTimezone, ObjectDataTests){
        
-       CalendarTimezoneObject TestTimezone;
-       ASSERT_EQ(CALENDAROBJECTLOAD_OK, TestTimezone.LoadFile("iCalendarTimezone-Load2.vcf"));
-       ASSERT_EQ(CALENDAROBJECTVALID_OK, TestTimezone.ValidBaseObject());
+       CalendarTimezoneObject testTimezone;
+       ASSERT_EQ(CALENDAROBJECTLOAD_OK, testTimezone.LoadFile("iCalendarTimezone-Load2.vcf"));
+       ASSERT_EQ(CALENDAROBJECTVALID_OK, testTimezone.ValidBaseObject());
        
        // Tests for UID.
        
-       ASSERT_EQ("Example/Starrgazy", TestTimezone.TimeZoneData);
-       ASSERT_EQ("OTHER=PARAM", TestTimezone.TimeZoneDataTokens);
+       ASSERT_EQ("Example/Starrgazy", testTimezone.timeZoneData);
+       ASSERT_EQ("OTHER=PARAM", testTimezone.timeZoneDataTokens);
        
        // Tests for LAST-MODIFIED.
        
-       ASSERT_EQ("20160203T200700Z", TestTimezone.LastModifiedData);
-       ASSERT_EQ("FUTURE=ODD", TestTimezone.LastModifiedTokens);
+       ASSERT_EQ("20160203T200700Z", testTimezone.lastModifiedData);
+       ASSERT_EQ("FUTURE=ODD", testTimezone.lastModifiedTokens);
 
        // Tests for TZURL.
        
-       ASSERT_EQ("http://www.example.com/", TestTimezone.TimeZoneURLData);
-       ASSERT_EQ("URL=YES", TestTimezone.TimeZoneURLTokens);
+       ASSERT_EQ("http://www.example.com/", testTimezone.timeZoneURLData);
+       ASSERT_EQ("URL=YES", testTimezone.timeZoneURLTokens);
        
        // Tests for the first STANDARD data.
        
-       std::string DateTimeStartData;
-       std::string TimeZoneOffsetToData;
-       std::string TimeZoneOffsetFromData;
+       std::string dateTimeStartData;
+       std::string timeZoneOffsetToData;
+       std::string timeZoneOffsetFromData;
        
-       if (TestTimezone.TimezoneStandardCollection.size() > 0){
+       if (testTimezone.timeZoneStandardCollection.size() > 0){
        
-               DateTimeStartData = TestTimezone.TimezoneStandardCollection[0].DateTimeStartData;
+               dateTimeStartData = testTimezone.timeZoneStandardCollection[0].dateTimeStartData;
        
        }
 
-       if (TestTimezone.TimezoneStandardCollection.size() > 0){
+       if (testTimezone.timeZoneStandardCollection.size() > 0){
        
-               TimeZoneOffsetToData = TestTimezone.TimezoneStandardCollection[0].TimeZoneOffsetToData;
+               timeZoneOffsetToData = testTimezone.timeZoneStandardCollection[0].timeZoneOffsetToData;
        
        }
        
-       if (TestTimezone.TimezoneStandardCollection.size() > 0){
+       if (testTimezone.timeZoneStandardCollection.size() > 0){
        
-               TimeZoneOffsetFromData = TestTimezone.TimezoneStandardCollection[0].TimeZoneOffsetFromData;
+               timeZoneOffsetFromData = testTimezone.timeZoneStandardCollection[0].timeZoneOffsetFromData;
        
        }
        
-       ASSERT_EQ("20160204T020000", DateTimeStartData);
-       ASSERT_EQ("-0400", TimeZoneOffsetToData);
-       ASSERT_EQ("-0500", TimeZoneOffsetFromData);
+       ASSERT_EQ("20160204T020000", dateTimeStartData);
+       ASSERT_EQ("-0400", timeZoneOffsetToData);
+       ASSERT_EQ("-0500", timeZoneOffsetFromData);
        
        // Tests for the second STANDARD data.
        
-       std::string DateTimeStartTokens;
-       std::string TimeZoneOffsetToTokens;
-       std::string TimeZoneOffsetFromTokens;
+       std::string dateTimeStartTokens;
+       std::string timeZoneOffsetToTokens;
+       std::string timeZoneOffsetFromTokens;
        
-       std::string RecurranceRuleData;
-       std::string RecurranceRuleDataTokens;
+       std::string recurranceRuleData;
+       std::string recurranceRuleDataTokens;
        
-       std::string CommentList;
-       std::string CommentListAltRep;
-       std::string CommentListLanguage;
-       std::string CommentListTokens;
+       std::string commentList;
+       std::string commentListAltRep;
+       std::string commentListLanguage;
+       std::string commentListTokens;
        
-       std::string RecurranceDateData;
-       std::string RecurranceDateValue;
-       std::string RecurranceDateDataTimeZoneParam;
-       std::string RecurranceDateDataTokens;
+       std::string recurranceDateData;
+       std::string recurranceDateValue;
+       std::string recurranceDateDatatimeZoneParam;
+       std::string recurranceDateDataTokens;
        
-       std::string TimeZoneNameData;
-       std::string TimeZoneNameLanguage;
-       std::string TimeZoneNameTokens;
+       std::string timeZoneNameData;
+       std::string timeZoneNameLanguage;
+       std::string timeZoneNameTokens;
        
-       std::string XTokensData;
-       std::string XTokensDataTokens;
+       std::string xTokensData;
+       std::string xTokensDataTokens;
        
-       DateTimeStartData.clear();
-       TimeZoneOffsetToData.clear();
-       TimeZoneOffsetFromData.clear();
+       dateTimeStartData.clear();
+       timeZoneOffsetToData.clear();
+       timeZoneOffsetFromData.clear();
        
-       if (TestTimezone.TimezoneStandardCollection.size() > 1){
+       if (testTimezone.timeZoneStandardCollection.size() > 1){
        
-               DateTimeStartData = TestTimezone.TimezoneStandardCollection[1].DateTimeStartData;
-               DateTimeStartTokens = TestTimezone.TimezoneStandardCollection[1].DateTimeStartTokens;
+               dateTimeStartData = testTimezone.timeZoneStandardCollection[1].dateTimeStartData;
+               dateTimeStartTokens = testTimezone.timeZoneStandardCollection[1].dateTimeStartTokens;
        
        }
 
-       if (TestTimezone.TimezoneStandardCollection.size() > 1){
+       if (testTimezone.timeZoneStandardCollection.size() > 1){
        
-               TimeZoneOffsetToData = TestTimezone.TimezoneStandardCollection[1].TimeZoneOffsetToData;
-               TimeZoneOffsetToTokens = TestTimezone.TimezoneStandardCollection[1].TimeZoneOffsetToTokens;
+               timeZoneOffsetToData = testTimezone.timeZoneStandardCollection[1].timeZoneOffsetToData;
+               timeZoneOffsetToTokens = testTimezone.timeZoneStandardCollection[1].timeZoneOffsetToTokens;
        
        }
        
-       if (TestTimezone.TimezoneStandardCollection.size() > 1){
+       if (testTimezone.timeZoneStandardCollection.size() > 1){
        
-               TimeZoneOffsetFromData = TestTimezone.TimezoneStandardCollection[1].TimeZoneOffsetFromData;
-               TimeZoneOffsetFromTokens = TestTimezone.TimezoneStandardCollection[1].TimeZoneOffsetFromTokens;
+               timeZoneOffsetFromData = testTimezone.timeZoneStandardCollection[1].timeZoneOffsetFromData;
+               timeZoneOffsetFromTokens = testTimezone.timeZoneStandardCollection[1].timeZoneOffsetFromTokens;
        
        }
        
-       ASSERT_EQ("20160205T020000", DateTimeStartData);
-       ASSERT_EQ("MEEP=MOO", DateTimeStartTokens);
-       ASSERT_EQ("-0400", TimeZoneOffsetToData);
-       ASSERT_EQ("EXAMPLE=DATA", TimeZoneOffsetToTokens);
-       ASSERT_EQ("-0500", TimeZoneOffsetFromData);
-       ASSERT_EQ("LETS=GO", TimeZoneOffsetFromTokens);
+       ASSERT_EQ("20160205T020000", dateTimeStartData);
+       ASSERT_EQ("MEEP=MOO", dateTimeStartTokens);
+       ASSERT_EQ("-0400", timeZoneOffsetToData);
+       ASSERT_EQ("EXAMPLE=DATA", timeZoneOffsetToTokens);
+       ASSERT_EQ("-0500", timeZoneOffsetFromData);
+       ASSERT_EQ("LETS=GO", timeZoneOffsetFromTokens);
        
        // Tests for third STANDARD data.
        
-       DateTimeStartData.clear();
-       DateTimeStartTokens.clear();
-       TimeZoneOffsetToData.clear();
-       TimeZoneOffsetToTokens.clear();
-       TimeZoneOffsetFromData.clear();
-       TimeZoneOffsetFromTokens.clear();
+       dateTimeStartData.clear();
+       dateTimeStartTokens.clear();
+       timeZoneOffsetToData.clear();
+       timeZoneOffsetToTokens.clear();
+       timeZoneOffsetFromData.clear();
+       timeZoneOffsetFromTokens.clear();
        
-       if (TestTimezone.TimezoneStandardCollection.size() > 2){
+       if (testTimezone.timeZoneStandardCollection.size() > 2){
        
-               DateTimeStartData = TestTimezone.TimezoneStandardCollection[2].DateTimeStartData;
-               DateTimeStartTokens = TestTimezone.TimezoneStandardCollection[2].DateTimeStartTokens;
+               dateTimeStartData = testTimezone.timeZoneStandardCollection[2].dateTimeStartData;
+               dateTimeStartTokens = testTimezone.timeZoneStandardCollection[2].dateTimeStartTokens;
        
        }
 
-       if (TestTimezone.TimezoneStandardCollection.size() > 2){
+       if (testTimezone.timeZoneStandardCollection.size() > 2){
        
-               TimeZoneOffsetToData = TestTimezone.TimezoneStandardCollection[2].TimeZoneOffsetToData;
-               TimeZoneOffsetToTokens = TestTimezone.TimezoneStandardCollection[2].TimeZoneOffsetToTokens;
+               timeZoneOffsetToData = testTimezone.timeZoneStandardCollection[2].timeZoneOffsetToData;
+               timeZoneOffsetToTokens = testTimezone.timeZoneStandardCollection[2].timeZoneOffsetToTokens;
        
        }
        
-       if (TestTimezone.TimezoneStandardCollection.size() > 2){
+       if (testTimezone.timeZoneStandardCollection.size() > 2){
        
-               TimeZoneOffsetFromData = TestTimezone.TimezoneStandardCollection[2].TimeZoneOffsetFromData;
-               TimeZoneOffsetFromTokens = TestTimezone.TimezoneStandardCollection[2].TimeZoneOffsetFromTokens;
+               timeZoneOffsetFromData = testTimezone.timeZoneStandardCollection[2].timeZoneOffsetFromData;
+               timeZoneOffsetFromTokens = testTimezone.timeZoneStandardCollection[2].timeZoneOffsetFromTokens;
        
        }
        
-       if (TestTimezone.TimezoneStandardCollection.size() > 2 && 
-               TestTimezone.TimezoneStandardCollection[2].CommentList.size() > 0){
+       if (testTimezone.timeZoneStandardCollection.size() > 2 && 
+               testTimezone.timeZoneStandardCollection[2].commentList.size() > 0){
                
-               CommentList = TestTimezone.TimezoneStandardCollection[2].CommentList[0];
-               CommentListAltRep = TestTimezone.TimezoneStandardCollection[2].CommentListAltRep[0];
-               CommentListLanguage = TestTimezone.TimezoneStandardCollection[2].CommentListLanguage[0];
-               CommentListTokens = TestTimezone.TimezoneStandardCollection[2].CommentListTokens[0];
+               commentList = testTimezone.timeZoneStandardCollection[2].commentList[0];
+               commentListAltRep = testTimezone.timeZoneStandardCollection[2].commentListAltRep[0];
+               commentListLanguage = testTimezone.timeZoneStandardCollection[2].commentListLanguage[0];
+               commentListTokens = testTimezone.timeZoneStandardCollection[2].commentListTokens[0];
                        
        }
        
-       if (TestTimezone.TimezoneStandardCollection.size() > 2 && 
-               TestTimezone.TimezoneStandardCollection[2].RecurranceRuleData.size() > 0){
+       if (testTimezone.timeZoneStandardCollection.size() > 2 && 
+               testTimezone.timeZoneStandardCollection[2].recurranceRuleData.size() > 0){
                
-               RecurranceRuleData = TestTimezone.TimezoneStandardCollection[2].RecurranceRuleData;
-               RecurranceRuleDataTokens = TestTimezone.TimezoneStandardCollection[2].RecurranceRuleDataTokens;
+               recurranceRuleData = testTimezone.timeZoneStandardCollection[2].recurranceRuleData;
+               recurranceRuleDataTokens = testTimezone.timeZoneStandardCollection[2].recurranceRuleDataTokens;
                        
        }
 
-       if (TestTimezone.TimezoneStandardCollection.size() > 2 && 
-               TestTimezone.TimezoneStandardCollection[2].RecurranceDateData.size() > 0){
+       if (testTimezone.timeZoneStandardCollection.size() > 2 && 
+               testTimezone.timeZoneStandardCollection[2].recurranceDateData.size() > 0){
                
-               RecurranceDateData = TestTimezone.TimezoneStandardCollection[2].RecurranceDateData[0];
-               RecurranceDateValue = TestTimezone.TimezoneStandardCollection[2].RecurranceDateDataValue[0];
-               RecurranceDateDataTimeZoneParam = TestTimezone.TimezoneStandardCollection[2].RecurranceDateDataTimeZoneParam[0];
-               RecurranceDateDataTokens = TestTimezone.TimezoneStandardCollection[2].RecurranceDateDataTokens[0];
+               recurranceDateData = testTimezone.timeZoneStandardCollection[2].recurranceDateData[0];
+               recurranceDateValue = testTimezone.timeZoneStandardCollection[2].recurranceDateDataValue[0];
+               recurranceDateDatatimeZoneParam = testTimezone.timeZoneStandardCollection[2].recurranceDateDatatimeZoneParam[0];
+               recurranceDateDataTokens = testTimezone.timeZoneStandardCollection[2].recurranceDateDataTokens[0];
                        
        }
        
-       if (TestTimezone.TimezoneStandardCollection.size() > 2 && 
-               TestTimezone.TimezoneStandardCollection[2].TimeZoneNameData.size() > 0){
+       if (testTimezone.timeZoneStandardCollection.size() > 2 && 
+               testTimezone.timeZoneStandardCollection[2].timeZoneNameData.size() > 0){
                
-               TimeZoneNameData = TestTimezone.TimezoneStandardCollection[2].TimeZoneNameData[0];
-               TimeZoneNameLanguage = TestTimezone.TimezoneStandardCollection[2].TimeZoneNameLanguage[0];
-               TimeZoneNameTokens = TestTimezone.TimezoneStandardCollection[2].TimeZoneNameTokens[0];
+               timeZoneNameData = testTimezone.timeZoneStandardCollection[2].timeZoneNameData[0];
+               timeZoneNameLanguage = testTimezone.timeZoneStandardCollection[2].timeZoneNameLanguage[0];
+               timeZoneNameTokens = testTimezone.timeZoneStandardCollection[2].timeZoneNameTokens[0];
                        
        }
        
-       if (TestTimezone.TimezoneStandardCollection.size() > 2 && 
-               TestTimezone.TimezoneStandardCollection[2].XTokensData.size() > 0){
+       if (testTimezone.timeZoneStandardCollection.size() > 2 && 
+               testTimezone.timeZoneStandardCollection[2].xTokensData.size() > 0){
                
-               XTokensData = TestTimezone.TimezoneStandardCollection[2].XTokensData[0];
-               XTokensDataTokens = TestTimezone.TimezoneStandardCollection[2].XTokensDataTokens[0];
+               xTokensData = testTimezone.timeZoneStandardCollection[2].xTokensData[0];
+               xTokensDataTokens = testTimezone.timeZoneStandardCollection[2].xTokensDataTokens[0];
                        
        }
        
-       ASSERT_EQ("20160206T020000", DateTimeStartData);
-       ASSERT_EQ("MEEP=MOO", DateTimeStartTokens);
-       ASSERT_EQ("-0400", TimeZoneOffsetToData);
-       ASSERT_EQ("EXAMPLE=DATA", TimeZoneOffsetToTokens);
-       ASSERT_EQ("-0500", TimeZoneOffsetFromData);
-       ASSERT_EQ("LETS=GO", TimeZoneOffsetFromTokens);
+       ASSERT_EQ("20160206T020000", dateTimeStartData);
+       ASSERT_EQ("MEEP=MOO", dateTimeStartTokens);
+       ASSERT_EQ("-0400", timeZoneOffsetToData);
+       ASSERT_EQ("EXAMPLE=DATA", timeZoneOffsetToTokens);
+       ASSERT_EQ("-0500", timeZoneOffsetFromData);
+       ASSERT_EQ("LETS=GO", timeZoneOffsetFromTokens);
 
-       ASSERT_EQ("Example timezone comment.", CommentList);
-       ASSERT_EQ("null:nodata", CommentListAltRep);
-       ASSERT_EQ("kw", CommentListLanguage);
-       ASSERT_EQ("YO=YOYOS", CommentListTokens);
+       ASSERT_EQ("Example timezone comment.", commentList);
+       ASSERT_EQ("null:nodata", commentListAltRep);
+       ASSERT_EQ("kw", commentListLanguage);
+       ASSERT_EQ("YO=YOYOS", commentListTokens);
 
-       ASSERT_EQ("FREQ=DAILY;COUNT=10", RecurranceRuleData);
-       ASSERT_EQ("YAK=YES", RecurranceRuleDataTokens);
+       ASSERT_EQ("FREQ=DAILY;COUNT=10", recurranceRuleData);
+       ASSERT_EQ("YAK=YES", recurranceRuleDataTokens);
        
-       ASSERT_EQ("20160205,20160207,20160216,20160305", RecurranceDateData);
-       ASSERT_EQ("DATE", RecurranceDateValue);
-       ASSERT_EQ("Europe/Truro", RecurranceDateDataTimeZoneParam);
-       ASSERT_EQ("BEEP=BOOP", RecurranceDateDataTokens);
+       ASSERT_EQ("20160205,20160207,20160216,20160305", recurranceDateData);
+       ASSERT_EQ("DATE", recurranceDateValue);
+       ASSERT_EQ("Europe/Truro", recurranceDateDatatimeZoneParam);
+       ASSERT_EQ("BEEP=BOOP", recurranceDateDataTokens);
 
-       ASSERT_EQ("Example Timezone Name 1", TimeZoneNameData);
-       ASSERT_EQ("en", TimeZoneNameLanguage);
-       ASSERT_EQ("NOPE=YES", TimeZoneNameTokens);
+       ASSERT_EQ("Example Timezone Name 1", timeZoneNameData);
+       ASSERT_EQ("en", timeZoneNameLanguage);
+       ASSERT_EQ("NOPE=YES", timeZoneNameTokens);
 
-       ASSERT_EQ("Example Timezone Name 1", TimeZoneNameData);
-       ASSERT_EQ("en", TimeZoneNameLanguage);
+       ASSERT_EQ("Example Timezone Name 1", timeZoneNameData);
+       ASSERT_EQ("en", timeZoneNameLanguage);
 
-       ASSERT_EQ("Meep", XTokensData);
-       ASSERT_EQ("X-MOO", XTokensDataTokens);
+       ASSERT_EQ("Meep", xTokensData);
+       ASSERT_EQ("X-MOO", xTokensDataTokens);
 
-       XTokensData.clear();
-       XTokensDataTokens.clear();
+       xTokensData.clear();
+       xTokensDataTokens.clear();
 
-       if (TestTimezone.TimezoneStandardCollection.size() > 2 && 
-               TestTimezone.TimezoneStandardCollection[2].XTokensData.size() > 1){
+       if (testTimezone.timeZoneStandardCollection.size() > 2 && 
+               testTimezone.timeZoneStandardCollection[2].xTokensData.size() > 1){
                
-               XTokensData = TestTimezone.TimezoneStandardCollection[2].XTokensData[1];
-               XTokensDataTokens = TestTimezone.TimezoneStandardCollection[2].XTokensDataTokens[1];
+               xTokensData = testTimezone.timeZoneStandardCollection[2].xTokensData[1];
+               xTokensDataTokens = testTimezone.timeZoneStandardCollection[2].xTokensDataTokens[1];
                        
        }
 
-       ASSERT_EQ("Moop", XTokensData);
-       ASSERT_EQ("X-MOO", XTokensDataTokens);
+       ASSERT_EQ("Moop", xTokensData);
+       ASSERT_EQ("X-MOO", xTokensDataTokens);
        
-       XTokensData.clear();
-       XTokensDataTokens.clear();
+       xTokensData.clear();
+       xTokensDataTokens.clear();
        
-       if (TestTimezone.TimezoneStandardCollection.size() > 2 && 
-               TestTimezone.TimezoneStandardCollection[2].XTokensData.size() > 2){
+       if (testTimezone.timeZoneStandardCollection.size() > 2 && 
+               testTimezone.timeZoneStandardCollection[2].xTokensData.size() > 2){
                
-               XTokensData = TestTimezone.TimezoneStandardCollection[2].XTokensData[2];
-               XTokensDataTokens = TestTimezone.TimezoneStandardCollection[2].XTokensDataTokens[2];
+               xTokensData = testTimezone.timeZoneStandardCollection[2].xTokensData[2];
+               xTokensDataTokens = testTimezone.timeZoneStandardCollection[2].xTokensDataTokens[2];
                        
        }
 
-       ASSERT_EQ("Zaap", XTokensData);
-       ASSERT_EQ("X-MOO;MEEP=YIKES", XTokensDataTokens);
+       ASSERT_EQ("Zaap", xTokensData);
+       ASSERT_EQ("X-MOO;MEEP=YIKES", xTokensDataTokens);
        
-       XTokensData.clear();
-       XTokensDataTokens.clear();
+       xTokensData.clear();
+       xTokensDataTokens.clear();
 
-       if (TestTimezone.TimezoneStandardCollection.size() > 2 && 
-               TestTimezone.TimezoneStandardCollection[2].XTokensData.size() > 3){
+       if (testTimezone.timeZoneStandardCollection.size() > 2 && 
+               testTimezone.timeZoneStandardCollection[2].xTokensData.size() > 3){
                
-               XTokensData = TestTimezone.TimezoneStandardCollection[2].XTokensData[3];
-               XTokensDataTokens = TestTimezone.TimezoneStandardCollection[2].XTokensDataTokens[3];
+               xTokensData = testTimezone.timeZoneStandardCollection[2].xTokensData[3];
+               xTokensDataTokens = testTimezone.timeZoneStandardCollection[2].xTokensDataTokens[3];
                        
        }
 
-       ASSERT_EQ("Fork", XTokensData);
-       ASSERT_EQ("X-ITEM", XTokensDataTokens);
+       ASSERT_EQ("Fork", xTokensData);
+       ASSERT_EQ("X-ITEM", xTokensDataTokens);
        
-       XTokensData.clear();
-       XTokensDataTokens.clear();
+       xTokensData.clear();
+       xTokensDataTokens.clear();
        
-       if (TestTimezone.TimezoneStandardCollection.size() > 2 && 
-               TestTimezone.TimezoneStandardCollection[2].XTokensData.size() > 4){
+       if (testTimezone.timeZoneStandardCollection.size() > 2 && 
+               testTimezone.timeZoneStandardCollection[2].xTokensData.size() > 4){
                
-               XTokensData = TestTimezone.TimezoneStandardCollection[2].XTokensData[4];
-               XTokensDataTokens = TestTimezone.TimezoneStandardCollection[2].XTokensDataTokens[4];
+               xTokensData = testTimezone.timeZoneStandardCollection[2].xTokensData[4];
+               xTokensDataTokens = testTimezone.timeZoneStandardCollection[2].xTokensDataTokens[4];
                        
        }
 
-       ASSERT_EQ("Spoon", XTokensData);
-       ASSERT_EQ("X-ITEM", XTokensDataTokens);
+       ASSERT_EQ("Spoon", xTokensData);
+       ASSERT_EQ("X-ITEM", xTokensDataTokens);
        
-       XTokensData.clear();
-       XTokensDataTokens.clear();
+       xTokensData.clear();
+       xTokensDataTokens.clear();
        
-       if (TestTimezone.TimezoneStandardCollection.size() > 2 && 
-               TestTimezone.TimezoneStandardCollection[2].XTokensData.size() > 5){
+       if (testTimezone.timeZoneStandardCollection.size() > 2 && 
+               testTimezone.timeZoneStandardCollection[2].xTokensData.size() > 5){
                
-               XTokensData = TestTimezone.TimezoneStandardCollection[2].XTokensData[5];
-               XTokensDataTokens = TestTimezone.TimezoneStandardCollection[2].XTokensDataTokens[5];
+               xTokensData = testTimezone.timeZoneStandardCollection[2].xTokensData[5];
+               xTokensDataTokens = testTimezone.timeZoneStandardCollection[2].xTokensDataTokens[5];
                        
        }
 
-       ASSERT_EQ("Knife", XTokensData);
-       ASSERT_EQ("X-ITEM;DIRTY=NO", XTokensDataTokens);
+       ASSERT_EQ("Knife", xTokensData);
+       ASSERT_EQ("X-ITEM;DIRTY=NO", xTokensDataTokens);
        
-       XTokensData.clear();
-       XTokensDataTokens.clear();
+       xTokensData.clear();
+       xTokensDataTokens.clear();
 
-       if (TestTimezone.TimezoneStandardCollection.size() > 2 && 
-               TestTimezone.TimezoneStandardCollection[2].XTokensData.size() > 6){
+       if (testTimezone.timeZoneStandardCollection.size() > 2 && 
+               testTimezone.timeZoneStandardCollection[2].xTokensData.size() > 6){
                
-               XTokensData = TestTimezone.TimezoneStandardCollection[2].XTokensData[6];
-               XTokensDataTokens = TestTimezone.TimezoneStandardCollection[2].XTokensDataTokens[6];
+               xTokensData = testTimezone.timeZoneStandardCollection[2].xTokensData[6];
+               xTokensDataTokens = testTimezone.timeZoneStandardCollection[2].xTokensDataTokens[6];
                        
        }
 
-       ASSERT_EQ("1", XTokensData);
-       ASSERT_EQ("X-NOPE", XTokensDataTokens);
+       ASSERT_EQ("1", xTokensData);
+       ASSERT_EQ("X-NOPE", xTokensDataTokens);
        
-       XTokensData.clear();
-       XTokensDataTokens.clear();
+       xTokensData.clear();
+       xTokensDataTokens.clear();
        
-       if (TestTimezone.TimezoneStandardCollection.size() > 2 && 
-               TestTimezone.TimezoneStandardCollection[2].XTokensData.size() > 7){
+       if (testTimezone.timeZoneStandardCollection.size() > 2 && 
+               testTimezone.timeZoneStandardCollection[2].xTokensData.size() > 7){
                
-               XTokensData = TestTimezone.TimezoneStandardCollection[2].XTokensData[7];
-               XTokensDataTokens = TestTimezone.TimezoneStandardCollection[2].XTokensDataTokens[7];
+               xTokensData = testTimezone.timeZoneStandardCollection[2].xTokensData[7];
+               xTokensDataTokens = testTimezone.timeZoneStandardCollection[2].xTokensDataTokens[7];
                        
        }
 
-       ASSERT_EQ("2", XTokensData);
-       ASSERT_EQ("X-NOPE", XTokensDataTokens);
+       ASSERT_EQ("2", xTokensData);
+       ASSERT_EQ("X-NOPE", xTokensDataTokens);
        
-       XTokensData.clear();
-       XTokensDataTokens.clear();
+       xTokensData.clear();
+       xTokensDataTokens.clear();
        
-       if (TestTimezone.TimezoneStandardCollection.size() > 2 && 
-               TestTimezone.TimezoneStandardCollection[2].XTokensData.size() > 8){
+       if (testTimezone.timeZoneStandardCollection.size() > 2 && 
+               testTimezone.timeZoneStandardCollection[2].xTokensData.size() > 8){
                
-               XTokensData = TestTimezone.TimezoneStandardCollection[2].XTokensData[8];
-               XTokensDataTokens = TestTimezone.TimezoneStandardCollection[2].XTokensDataTokens[8];
+               xTokensData = testTimezone.timeZoneStandardCollection[2].xTokensData[8];
+               xTokensDataTokens = testTimezone.timeZoneStandardCollection[2].xTokensDataTokens[8];
                        
        }
 
-       ASSERT_EQ("3", XTokensData);
-       ASSERT_EQ("X-NOPE;LONG=YES", XTokensDataTokens);
+       ASSERT_EQ("3", xTokensData);
+       ASSERT_EQ("X-NOPE;LONG=YES", xTokensDataTokens);
        
        // Tests for the first DAYLIGHT data.
        
-       DateTimeStartData.clear();
-       TimeZoneOffsetToData.clear();
-       TimeZoneOffsetFromData.clear();
+       dateTimeStartData.clear();
+       timeZoneOffsetToData.clear();
+       timeZoneOffsetFromData.clear();
        
-       if (TestTimezone.TimezoneDaylightCollection.size() > 0){
+       if (testTimezone.timeZoneDaylightCollection.size() > 0){
        
-               DateTimeStartData = TestTimezone.TimezoneDaylightCollection[0].DateTimeStartData;
+               dateTimeStartData = testTimezone.timeZoneDaylightCollection[0].dateTimeStartData;
        
        }
 
-       if (TestTimezone.TimezoneDaylightCollection.size() > 0){
+       if (testTimezone.timeZoneDaylightCollection.size() > 0){
        
-               TimeZoneOffsetToData = TestTimezone.TimezoneDaylightCollection[0].TimeZoneOffsetToData;
+               timeZoneOffsetToData = testTimezone.timeZoneDaylightCollection[0].timeZoneOffsetToData;
        
        }
        
-       if (TestTimezone.TimezoneDaylightCollection.size() > 0){
+       if (testTimezone.timeZoneDaylightCollection.size() > 0){
        
-               TimeZoneOffsetFromData = TestTimezone.TimezoneDaylightCollection[0].TimeZoneOffsetFromData;
+               timeZoneOffsetFromData = testTimezone.timeZoneDaylightCollection[0].timeZoneOffsetFromData;
        
        }
        
-       ASSERT_EQ("20160204T020000", DateTimeStartData);
-       ASSERT_EQ("-0400", TimeZoneOffsetToData);
-       ASSERT_EQ("-0500", TimeZoneOffsetFromData);
+       ASSERT_EQ("20160204T020000", dateTimeStartData);
+       ASSERT_EQ("-0400", timeZoneOffsetToData);
+       ASSERT_EQ("-0500", timeZoneOffsetFromData);
        
        // Tests for the second DAYLIGHT data.
        
-       DateTimeStartTokens.clear();
-       TimeZoneOffsetToTokens.clear();
-       TimeZoneOffsetFromTokens.clear();
+       dateTimeStartTokens.clear();
+       timeZoneOffsetToTokens.clear();
+       timeZoneOffsetFromTokens.clear();
        
-       RecurranceRuleData.clear();
-       RecurranceRuleDataTokens.clear();
+       recurranceRuleData.clear();
+       recurranceRuleDataTokens.clear();
        
-       CommentList.clear();
-       CommentListAltRep.clear();
-       CommentListLanguage.clear();
-       CommentListTokens.clear();
+       commentList.clear();
+       commentListAltRep.clear();
+       commentListLanguage.clear();
+       commentListTokens.clear();
        
-       RecurranceDateData.clear();
-       RecurranceDateValue.clear();
-       RecurranceDateDataTimeZoneParam.clear();
-       RecurranceDateDataTokens.clear();
+       recurranceDateData.clear();
+       recurranceDateValue.clear();
+       recurranceDateDatatimeZoneParam.clear();
+       recurranceDateDataTokens.clear();
        
-       TimeZoneNameData.clear();
-       TimeZoneNameLanguage.clear();
-       TimeZoneNameTokens.clear();
+       timeZoneNameData.clear();
+       timeZoneNameLanguage.clear();
+       timeZoneNameTokens.clear();
        
-       XTokensData.clear();
-       XTokensDataTokens.clear();
+       xTokensData.clear();
+       xTokensDataTokens.clear();
        
-       DateTimeStartData.clear();
-       TimeZoneOffsetToData.clear();
-       TimeZoneOffsetFromData.clear();
+       dateTimeStartData.clear();
+       timeZoneOffsetToData.clear();
+       timeZoneOffsetFromData.clear();
        
-       if (TestTimezone.TimezoneDaylightCollection.size() > 1){
+       if (testTimezone.timeZoneDaylightCollection.size() > 1){
        
-               DateTimeStartData = TestTimezone.TimezoneDaylightCollection[1].DateTimeStartData;
-               DateTimeStartTokens = TestTimezone.TimezoneDaylightCollection[1].DateTimeStartTokens;
+               dateTimeStartData = testTimezone.timeZoneDaylightCollection[1].dateTimeStartData;
+               dateTimeStartTokens = testTimezone.timeZoneDaylightCollection[1].dateTimeStartTokens;
        
        }
 
-       if (TestTimezone.TimezoneDaylightCollection.size() > 1){
+       if (testTimezone.timeZoneDaylightCollection.size() > 1){
        
-               TimeZoneOffsetToData = TestTimezone.TimezoneDaylightCollection[1].TimeZoneOffsetToData;
-               TimeZoneOffsetToTokens = TestTimezone.TimezoneDaylightCollection[1].TimeZoneOffsetToTokens;
+               timeZoneOffsetToData = testTimezone.timeZoneDaylightCollection[1].timeZoneOffsetToData;
+               timeZoneOffsetToTokens = testTimezone.timeZoneDaylightCollection[1].timeZoneOffsetToTokens;
        
        }
        
-       if (TestTimezone.TimezoneDaylightCollection.size() > 1){
+       if (testTimezone.timeZoneDaylightCollection.size() > 1){
        
-               TimeZoneOffsetFromData = TestTimezone.TimezoneDaylightCollection[1].TimeZoneOffsetFromData;
-               TimeZoneOffsetFromTokens = TestTimezone.TimezoneDaylightCollection[1].TimeZoneOffsetFromTokens;
+               timeZoneOffsetFromData = testTimezone.timeZoneDaylightCollection[1].timeZoneOffsetFromData;
+               timeZoneOffsetFromTokens = testTimezone.timeZoneDaylightCollection[1].timeZoneOffsetFromTokens;
        
        }
        
-       ASSERT_EQ("20160205T020000", DateTimeStartData);
-       ASSERT_EQ("MEEP=MOO", DateTimeStartTokens);
-       ASSERT_EQ("-0400", TimeZoneOffsetToData);
-       ASSERT_EQ("EXAMPLE=DATA", TimeZoneOffsetToTokens);
-       ASSERT_EQ("-0500", TimeZoneOffsetFromData);
-       ASSERT_EQ("LETS=GO", TimeZoneOffsetFromTokens);
+       ASSERT_EQ("20160205T020000", dateTimeStartData);
+       ASSERT_EQ("MEEP=MOO", dateTimeStartTokens);
+       ASSERT_EQ("-0400", timeZoneOffsetToData);
+       ASSERT_EQ("EXAMPLE=DATA", timeZoneOffsetToTokens);
+       ASSERT_EQ("-0500", timeZoneOffsetFromData);
+       ASSERT_EQ("LETS=GO", timeZoneOffsetFromTokens);
        
        // Tests for third DAYLIGHT data.
        
-       DateTimeStartData.clear();
-       DateTimeStartTokens.clear();
-       TimeZoneOffsetToData.clear();
-       TimeZoneOffsetToTokens.clear();
-       TimeZoneOffsetFromData.clear();
-       TimeZoneOffsetFromTokens.clear();
+       dateTimeStartData.clear();
+       dateTimeStartTokens.clear();
+       timeZoneOffsetToData.clear();
+       timeZoneOffsetToTokens.clear();
+       timeZoneOffsetFromData.clear();
+       timeZoneOffsetFromTokens.clear();
        
-       if (TestTimezone.TimezoneDaylightCollection.size() > 2){
+       if (testTimezone.timeZoneDaylightCollection.size() > 2){
        
-               DateTimeStartData = TestTimezone.TimezoneDaylightCollection[2].DateTimeStartData;
-               DateTimeStartTokens = TestTimezone.TimezoneDaylightCollection[2].DateTimeStartTokens;
+               dateTimeStartData = testTimezone.timeZoneDaylightCollection[2].dateTimeStartData;
+               dateTimeStartTokens = testTimezone.timeZoneDaylightCollection[2].dateTimeStartTokens;
        
        }
 
-       if (TestTimezone.TimezoneDaylightCollection.size() > 2){
+       if (testTimezone.timeZoneDaylightCollection.size() > 2){
        
-               TimeZoneOffsetToData = TestTimezone.TimezoneDaylightCollection[2].TimeZoneOffsetToData;
-               TimeZoneOffsetToTokens = TestTimezone.TimezoneDaylightCollection[2].TimeZoneOffsetToTokens;
+               timeZoneOffsetToData = testTimezone.timeZoneDaylightCollection[2].timeZoneOffsetToData;
+               timeZoneOffsetToTokens = testTimezone.timeZoneDaylightCollection[2].timeZoneOffsetToTokens;
        
        }
        
-       if (TestTimezone.TimezoneDaylightCollection.size() > 2){
+       if (testTimezone.timeZoneDaylightCollection.size() > 2){
        
-               TimeZoneOffsetFromData = TestTimezone.TimezoneDaylightCollection[2].TimeZoneOffsetFromData;
-               TimeZoneOffsetFromTokens = TestTimezone.TimezoneDaylightCollection[2].TimeZoneOffsetFromTokens;
+               timeZoneOffsetFromData = testTimezone.timeZoneDaylightCollection[2].timeZoneOffsetFromData;
+               timeZoneOffsetFromTokens = testTimezone.timeZoneDaylightCollection[2].timeZoneOffsetFromTokens;
        
        }
        
-       if (TestTimezone.TimezoneDaylightCollection.size() > 2 && 
-               TestTimezone.TimezoneDaylightCollection[2].CommentList.size() > 0){
+       if (testTimezone.timeZoneDaylightCollection.size() > 2 && 
+               testTimezone.timeZoneDaylightCollection[2].commentList.size() > 0){
                
-               CommentList = TestTimezone.TimezoneDaylightCollection[2].CommentList[0];
-               CommentListAltRep = TestTimezone.TimezoneDaylightCollection[2].CommentListAltRep[0];
-               CommentListLanguage = TestTimezone.TimezoneDaylightCollection[2].CommentListLanguage[0];
-               CommentListTokens = TestTimezone.TimezoneDaylightCollection[2].CommentListTokens[0];
+               commentList = testTimezone.timeZoneDaylightCollection[2].commentList[0];
+               commentListAltRep = testTimezone.timeZoneDaylightCollection[2].commentListAltRep[0];
+               commentListLanguage = testTimezone.timeZoneDaylightCollection[2].commentListLanguage[0];
+               commentListTokens = testTimezone.timeZoneDaylightCollection[2].commentListTokens[0];
                        
        }
        
-       if (TestTimezone.TimezoneDaylightCollection.size() > 2 && 
-               TestTimezone.TimezoneDaylightCollection[2].RecurranceRuleData.size() > 0){
+       if (testTimezone.timeZoneDaylightCollection.size() > 2 && 
+               testTimezone.timeZoneDaylightCollection[2].recurranceRuleData.size() > 0){
                
-               RecurranceRuleData = TestTimezone.TimezoneDaylightCollection[2].RecurranceRuleData;
-               RecurranceRuleDataTokens = TestTimezone.TimezoneDaylightCollection[2].RecurranceRuleDataTokens;
+               recurranceRuleData = testTimezone.timeZoneDaylightCollection[2].recurranceRuleData;
+               recurranceRuleDataTokens = testTimezone.timeZoneDaylightCollection[2].recurranceRuleDataTokens;
                        
        }
 
-       if (TestTimezone.TimezoneDaylightCollection.size() > 2 && 
-               TestTimezone.TimezoneDaylightCollection[2].RecurranceDateData.size() > 0){
+       if (testTimezone.timeZoneDaylightCollection.size() > 2 && 
+               testTimezone.timeZoneDaylightCollection[2].recurranceDateData.size() > 0){
                
-               RecurranceDateData = TestTimezone.TimezoneDaylightCollection[2].RecurranceDateData[0];
-               RecurranceDateValue = TestTimezone.TimezoneDaylightCollection[2].RecurranceDateDataValue[0];
-               RecurranceDateDataTimeZoneParam = TestTimezone.TimezoneDaylightCollection[2].RecurranceDateDataTimeZoneParam[0];
-               RecurranceDateDataTokens = TestTimezone.TimezoneDaylightCollection[2].RecurranceDateDataTokens[0];
+               recurranceDateData = testTimezone.timeZoneDaylightCollection[2].recurranceDateData[0];
+               recurranceDateValue = testTimezone.timeZoneDaylightCollection[2].recurranceDateDataValue[0];
+               recurranceDateDataTimeZoneParam = testTimezone.timeZoneDaylightCollection[2].recurranceDateDataTimeZoneParam[0];
+               recurranceDateDataTokens = testTimezone.timeZoneDaylightCollection[2].recurranceDateDataTokens[0];
                        
        }
        
-       if (TestTimezone.TimezoneDaylightCollection.size() > 2 && 
-               TestTimezone.TimezoneDaylightCollection[2].TimeZoneNameData.size() > 0){
+       if (testTimezone.timeZoneDaylightCollection.size() > 2 && 
+               testTimezone.timeZoneDaylightCollection[2].timeZoneNameData.size() > 0){
                
-               TimeZoneNameData = TestTimezone.TimezoneDaylightCollection[2].TimeZoneNameData[0];
-               TimeZoneNameLanguage = TestTimezone.TimezoneDaylightCollection[2].TimeZoneNameLanguage[0];
-               TimeZoneNameTokens = TestTimezone.TimezoneDaylightCollection[2].TimeZoneNameTokens[0];
+               timeZoneNameData = testTimezone.timeZoneDaylightCollection[2].timeZoneNameData[0];
+               timeZoneNameLanguage = testTimezone.timeZoneDaylightCollection[2].timeZoneNameLanguage[0];
+               timeZoneNameTokens = testTimezone.timeZoneDaylightCollection[2].timeZoneNameTokens[0];
                        
        }
        
-       if (TestTimezone.TimezoneDaylightCollection.size() > 2 && 
-               TestTimezone.TimezoneDaylightCollection[2].XTokensData.size() > 0){
+       if (testTimezone.timeZoneDaylightCollection.size() > 2 && 
+               testTimezone.timeZoneDaylightCollection[2].xTokensData.size() > 0){
                
-               XTokensData = TestTimezone.TimezoneDaylightCollection[2].XTokensData[0];
-               XTokensDataTokens = TestTimezone.TimezoneDaylightCollection[2].XTokensDataTokens[0];
+               xTokensData = testTimezone.timeZoneDaylightCollection[2].xTokensData[0];
+               xTokensDataTokens = testTimezone.timeZoneDaylightCollection[2].xTokensDataTokens[0];
                        
        }
        
-       ASSERT_EQ("20160206T020000", DateTimeStartData);
-       ASSERT_EQ("MEEP=MOO", DateTimeStartTokens);
-       ASSERT_EQ("-0400", TimeZoneOffsetToData);
-       ASSERT_EQ("EXAMPLE=DATA", TimeZoneOffsetToTokens);
-       ASSERT_EQ("-0500", TimeZoneOffsetFromData);
-       ASSERT_EQ("LETS=GO", TimeZoneOffsetFromTokens);
+       ASSERT_EQ("20160206T020000", dateTimeStartData);
+       ASSERT_EQ("MEEP=MOO", dateTimeStartTokens);
+       ASSERT_EQ("-0400", timeZoneOffsetToData);
+       ASSERT_EQ("EXAMPLE=DATA", timeZoneOffsetToTokens);
+       ASSERT_EQ("-0500", timeZoneOffsetFromData);
+       ASSERT_EQ("LETS=GO", timeZoneOffsetFromTokens);
 
-       ASSERT_EQ("Example timezone comment.", CommentList);
-       ASSERT_EQ("null:nodata", CommentListAltRep);
-       ASSERT_EQ("kw", CommentListLanguage);
-       ASSERT_EQ("YO=YOYOS", CommentListTokens);
+       ASSERT_EQ("Example timezone comment.", commentList);
+       ASSERT_EQ("null:nodata", commentListAltRep);
+       ASSERT_EQ("kw", commentListLanguage);
+       ASSERT_EQ("YO=YOYOS", commentListTokens);
 
-       ASSERT_EQ("FREQ=DAILY;COUNT=10", RecurranceRuleData);
-       ASSERT_EQ("YAK=YES", RecurranceRuleDataTokens);
+       ASSERT_EQ("FREQ=DAILY;COUNT=10", recurranceRuleData);
+       ASSERT_EQ("YAK=YES", recurranceRuleDataTokens);
        
-       ASSERT_EQ("20160205,20160207,20160216,20160305", RecurranceDateData);
-       ASSERT_EQ("DATE", RecurranceDateValue);
-       ASSERT_EQ("Europe/Truro", RecurranceDateDataTimeZoneParam);
-       ASSERT_EQ("BEEP=BOOP", RecurranceDateDataTokens);
+       ASSERT_EQ("20160205,20160207,20160216,20160305", recurranceDateData);
+       ASSERT_EQ("DATE", recurranceDateValue);
+       ASSERT_EQ("Europe/Truro", recurranceDateDataTimeZoneParam);
+       ASSERT_EQ("BEEP=BOOP", recurranceDateDataTokens);
 
-       ASSERT_EQ("Example Timezone Name 1", TimeZoneNameData);
-       ASSERT_EQ("en", TimeZoneNameLanguage);
-       ASSERT_EQ("NOPE=YES", TimeZoneNameTokens);
+       ASSERT_EQ("Example Timezone Name 1", timeZoneNameData);
+       ASSERT_EQ("en", timeZoneNameLanguage);
+       ASSERT_EQ("NOPE=YES", timeZoneNameTokens);
 
-       ASSERT_EQ("Example Timezone Name 1", TimeZoneNameData);
-       ASSERT_EQ("en", TimeZoneNameLanguage);
+       ASSERT_EQ("Example Timezone Name 1", timeZoneNameData);
+       ASSERT_EQ("en", timeZoneNameLanguage);
 
-       ASSERT_EQ("Meep", XTokensData);
-       ASSERT_EQ("X-MOO", XTokensDataTokens);
+       ASSERT_EQ("Meep", xTokensData);
+       ASSERT_EQ("X-MOO", xTokensDataTokens);
 
-       XTokensData.clear();
-       XTokensDataTokens.clear();
+       xTokensData.clear();
+       xTokensDataTokens.clear();
 
-       if (TestTimezone.TimezoneDaylightCollection.size() > 2 && 
-               TestTimezone.TimezoneDaylightCollection[2].XTokensData.size() > 1){
+       if (testTimezone.timeZoneDaylightCollection.size() > 2 && 
+               testTimezone.timeZoneDaylightCollection[2].xTokensData.size() > 1){
                
-               XTokensData = TestTimezone.TimezoneDaylightCollection[2].XTokensData[1];
-               XTokensDataTokens = TestTimezone.TimezoneDaylightCollection[2].XTokensDataTokens[1];
+               xTokensData = testTimezone.timeZoneDaylightCollection[2].xTokensData[1];
+               xTokensDataTokens = testTimezone.timeZoneDaylightCollection[2].xTokensDataTokens[1];
                        
        }
 
-       ASSERT_EQ("Moop", XTokensData);
-       ASSERT_EQ("X-MOO", XTokensDataTokens);
+       ASSERT_EQ("Moop", xTokensData);
+       ASSERT_EQ("X-MOO", xTokensDataTokens);
        
-       XTokensData.clear();
-       XTokensDataTokens.clear();
+       xTokensData.clear();
+       xTokensDataTokens.clear();
        
-       if (TestTimezone.TimezoneDaylightCollection.size() > 2 && 
-               TestTimezone.TimezoneDaylightCollection[2].XTokensData.size() > 2){
+       if (testTimezone.timeZoneDaylightCollection.size() > 2 && 
+               testTimezone.timeZoneDaylightCollection[2].xTokensData.size() > 2){
                
-               XTokensData = TestTimezone.TimezoneDaylightCollection[2].XTokensData[2];
-               XTokensDataTokens = TestTimezone.TimezoneDaylightCollection[2].XTokensDataTokens[2];
+               xTokensData = testTimezone.timeZoneDaylightCollection[2].xTokensData[2];
+               xTokensDataTokens = testTimezone.timeZoneDaylightCollection[2].xTokensDataTokens[2];
                        
        }
 
-       ASSERT_EQ("Zaap", XTokensData);
-       ASSERT_EQ("X-MOO;MEEP=YIKES", XTokensDataTokens);
+       ASSERT_EQ("Zaap", xTokensData);
+       ASSERT_EQ("X-MOO;MEEP=YIKES", xTokensDataTokens);
        
-       XTokensData.clear();
-       XTokensDataTokens.clear();
+       xTokensData.clear();
+       xTokensDataTokens.clear();
 
-       if (TestTimezone.TimezoneDaylightCollection.size() > 2 && 
-               TestTimezone.TimezoneDaylightCollection[2].XTokensData.size() > 3){
+       if (testTimezone.timeZoneDaylightCollection.size() > 2 && 
+               testTimezone.timeZoneDaylightCollection[2].xTokensData.size() > 3){
                
-               XTokensData = TestTimezone.TimezoneDaylightCollection[2].XTokensData[3];
-               XTokensDataTokens = TestTimezone.TimezoneDaylightCollection[2].XTokensDataTokens[3];
+               xTokensData = testTimezone.timeZoneDaylightCollection[2].xTokensData[3];
+               xTokensDataTokens = testTimezone.timeZoneDaylightCollection[2].xTokensDataTokens[3];
                        
        }
 
-       ASSERT_EQ("Fork", XTokensData);
-       ASSERT_EQ("X-ITEM", XTokensDataTokens);
+       ASSERT_EQ("Fork", xTokensData);
+       ASSERT_EQ("X-ITEM", xTokensDataTokens);
        
-       XTokensData.clear();
-       XTokensDataTokens.clear();
+       xTokensData.clear();
+       xTokensDataTokens.clear();
        
-       if (TestTimezone.TimezoneDaylightCollection.size() > 2 && 
-               TestTimezone.TimezoneDaylightCollection[2].XTokensData.size() > 4){
+       if (testTimezone.timeZoneDaylightCollection.size() > 2 && 
+               testTimezone.timeZoneDaylightCollection[2].xTokensData.size() > 4){
                
-               XTokensData = TestTimezone.TimezoneDaylightCollection[2].XTokensData[4];
-               XTokensDataTokens = TestTimezone.TimezoneDaylightCollection[2].XTokensDataTokens[4];
+               xTokensData = testTimezone.timeZoneDaylightCollection[2].xTokensData[4];
+               xTokensDataTokens = testTimezone.timeZoneDaylightCollection[2].xTokensDataTokens[4];
                        
        }
 
-       ASSERT_EQ("Spoon", XTokensData);
-       ASSERT_EQ("X-ITEM", XTokensDataTokens);
+       ASSERT_EQ("Spoon", xTokensData);
+       ASSERT_EQ("X-ITEM", xTokensDataTokens);
        
-       XTokensData.clear();
-       XTokensDataTokens.clear();
+       xTokensData.clear();
+       xTokensDataTokens.clear();
        
-       if (TestTimezone.TimezoneDaylightCollection.size() > 2 && 
-               TestTimezone.TimezoneDaylightCollection[2].XTokensData.size() > 5){
+       if (testTimezone.timeZoneDaylightCollection.size() > 2 && 
+               testTimezone.timeZoneDaylightCollection[2].xTokensData.size() > 5){
                
-               XTokensData = TestTimezone.TimezoneDaylightCollection[2].XTokensData[5];
-               XTokensDataTokens = TestTimezone.TimezoneDaylightCollection[2].XTokensDataTokens[5];
+               xTokensData = testTimezone.timeZoneDaylightCollection[2].xTokensData[5];
+               xTokensDataTokens = testTimezone.timeZoneDaylightCollection[2].xTokensDataTokens[5];
                        
        }
 
-       ASSERT_EQ("Knife", XTokensData);
-       ASSERT_EQ("X-ITEM;DIRTY=NO", XTokensDataTokens);
+       ASSERT_EQ("Knife", xTokensData);
+       ASSERT_EQ("X-ITEM;DIRTY=NO", xTokensDataTokens);
        
-       XTokensData.clear();
-       XTokensDataTokens.clear();
+       xTokensData.clear();
+       xTokensDataTokens.clear();
 
-       if (TestTimezone.TimezoneDaylightCollection.size() > 2 && 
-               TestTimezone.TimezoneDaylightCollection[2].XTokensData.size() > 6){
+       if (testTimezone.timeZoneDaylightCollection.size() > 2 && 
+               testTimezone.timeZoneDaylightCollection[2].xTokensData.size() > 6){
                
-               XTokensData = TestTimezone.TimezoneDaylightCollection[2].XTokensData[6];
-               XTokensDataTokens = TestTimezone.TimezoneDaylightCollection[2].XTokensDataTokens[6];
+               xTokensData = testTimezone.timeZoneDaylightCollection[2].xTokensData[6];
+               xTokensDataTokens = testTimezone.timeZoneDaylightCollection[2].xTokensDataTokens[6];
                        
        }
 
-       ASSERT_EQ("1", XTokensData);
-       ASSERT_EQ("X-NOPE", XTokensDataTokens);
+       ASSERT_EQ("1", xTokensData);
+       ASSERT_EQ("X-NOPE", xTokensDataTokens);
        
-       XTokensData.clear();
-       XTokensDataTokens.clear();
+       xTokensData.clear();
+       xTokensDataTokens.clear();
        
-       if (TestTimezone.TimezoneDaylightCollection.size() > 2 && 
-               TestTimezone.TimezoneDaylightCollection[2].XTokensData.size() > 7){
+       if (testTimezone.timeZoneDaylightCollection.size() > 2 && 
+               testTimezone.timeZoneDaylightCollection[2].xTokensData.size() > 7){
                
-               XTokensData = TestTimezone.TimezoneDaylightCollection[2].XTokensData[7];
-               XTokensDataTokens = TestTimezone.TimezoneDaylightCollection[2].XTokensDataTokens[7];
+               xTokensData = testTimezone.timeZoneDaylightCollection[2].xTokensData[7];
+               xTokensDataTokens = testTimezone.timeZoneDaylightCollection[2].xTokensDataTokens[7];
                        
        }
 
-       ASSERT_EQ("2", XTokensData);
-       ASSERT_EQ("X-NOPE", XTokensDataTokens);
+       ASSERT_EQ("2", xTokensData);
+       ASSERT_EQ("X-NOPE", xTokensDataTokens);
        
-       XTokensData.clear();
-       XTokensDataTokens.clear();
+       xTokensData.clear();
+       xTokensDataTokens.clear();
        
-       if (TestTimezone.TimezoneDaylightCollection.size() > 2 && 
-               TestTimezone.TimezoneDaylightCollection[2].XTokensData.size() > 8){
+       if (testTimezone.timeZoneDaylightCollection.size() > 2 && 
+               testTimezone.timeZoneDaylightCollection[2].xTokensData.size() > 8){
                
-               XTokensData = TestTimezone.TimezoneDaylightCollection[2].XTokensData[8];
-               XTokensDataTokens = TestTimezone.TimezoneDaylightCollection[2].XTokensDataTokens[8];
+               xTokensData = testTimezone.timeZoneDaylightCollection[2].xTokensData[8];
+               xTokensDataTokens = testTimezone.timeZoneDaylightCollection[2].xTokensDataTokens[8];
                        
        }
 
-       ASSERT_EQ("3", XTokensData);
-       ASSERT_EQ("X-NOPE;LONG=YES", XTokensDataTokens);
+       ASSERT_EQ("3", xTokensData);
+       ASSERT_EQ("X-NOPE;LONG=YES", xTokensDataTokens);
        
 }
\ No newline at end of file