Added CalendarDataStorage code and updated unit tests

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

diff --git a/source/tests/xestiacalendar_calendardatastorage.h b/source/tests/xestiacalendar_calendardatastorage.h
index 129533e..c75ca72 100644 (file)
--- a/source/tests/xestiacalendar_calendardatastorage.h
+++ b/source/tests/xestiacalendar_calendardatastorage.h
@@ -18,6 +18,8 @@
 
 #include "../libraries/CalendarDataStorage/CalendarDataStorage.h"
 
+Colour DefaultColour;
+
 TEST(CalendarDataStorage, Setup_Tables){
        
        CalendarDataStorage SetupTablesTest;
@@ -103,6 +105,72 @@ TEST(CalendarDataStorage, Get_Three_Accounts_Information){
        
 }
 
+TEST(CalendarDataStorage, Get_List_Of_One_Account){
+       
+       CalendarDataStorage AccountInformationTest;
+       
+       AccountInformationTest.AddAccount("Test Account 1");
+       
+       CDSAccountList accountListData = AccountInformationTest.GetAccountList();
+       
+       ASSERT_EQ(1, accountListData.accountList.size());
+       ASSERT_EQ(CDSACCOUNT_OK, accountListData.getAccountListResult);
+
+       ASSERT_EQ(1, accountListData.accountList[0].accountID); 
+       ASSERT_EQ(CDSACCOUNT_OK, accountListData.accountList[0].accountInfoResult);
+       ASSERT_EQ("Test Account 1", accountListData.accountList[0].accountName);
+       
+}
+
+TEST(CalendarDataStorage, Get_List_Of_Two_Accounts){
+       
+       CalendarDataStorage AccountInformationTest;
+       
+       AccountInformationTest.AddAccount("Test Account 1");
+       AccountInformationTest.AddAccount("Test Account 2");
+       
+       CDSAccountList accountListData = AccountInformationTest.GetAccountList();
+       
+       ASSERT_EQ(2, accountListData.accountList.size());
+       ASSERT_EQ(CDSACCOUNT_OK, accountListData.getAccountListResult);
+
+       ASSERT_EQ(1, accountListData.accountList[0].accountID); 
+       ASSERT_EQ(CDSACCOUNT_OK, accountListData.accountList[0].accountInfoResult);
+       ASSERT_EQ("Test Account 1", accountListData.accountList[0].accountName);
+
+       ASSERT_EQ(2, accountListData.accountList[1].accountID);
+       ASSERT_EQ(CDSACCOUNT_OK, accountListData.accountList[1].accountInfoResult);
+       ASSERT_EQ("Test Account 2", accountListData.accountList[1].accountName);
+       
+}
+
+TEST(CalendarDataStorage, Get_List_Of_Three_Accounts){
+       
+       CalendarDataStorage AccountInformationTest;
+       
+       AccountInformationTest.AddAccount("Test Account 1");
+       AccountInformationTest.AddAccount("Test Account 2");
+       AccountInformationTest.AddAccount("Test Account 3");
+       
+       CDSAccountList accountListData = AccountInformationTest.GetAccountList();
+       
+       ASSERT_EQ(3, accountListData.accountList.size());
+       ASSERT_EQ(CDSACCOUNT_OK, accountListData.getAccountListResult);
+
+       ASSERT_EQ(1, accountListData.accountList[0].accountID); 
+       ASSERT_EQ(CDSACCOUNT_OK, accountListData.accountList[0].accountInfoResult);
+       ASSERT_EQ("Test Account 1", accountListData.accountList[0].accountName);
+
+       ASSERT_EQ(2, accountListData.accountList[1].accountID);
+       ASSERT_EQ(CDSACCOUNT_OK, accountListData.accountList[1].accountInfoResult);
+       ASSERT_EQ("Test Account 2", accountListData.accountList[1].accountName);
+
+       ASSERT_EQ(3, accountListData.accountList[2].accountID);
+       ASSERT_EQ(CDSACCOUNT_OK, accountListData.accountList[2].accountInfoResult);
+       ASSERT_EQ("Test Account 3", accountListData.accountList[2].accountName);
+
+}
+
 TEST(CalendarDataStorage, Update_One_Account){
        
        CalendarDataStorage UpdateAccountTest;
@@ -215,7 +283,7 @@ TEST(CalendarDataStorage, Add_One_Calendar_To_One_Account){
        
        AddCalendarTest.AddAccount("Test Account 1");
 
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test"));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
        
 }
 
@@ -225,8 +293,8 @@ TEST(CalendarDataStorage, Add_Two_Calendars_To_One_Account){
        
        AddCalendarTest.AddAccount("Test Account 1");
 
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test"));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour));
        
 }
 
@@ -236,9 +304,9 @@ TEST(CalendarDataStorage, Add_Three_Calendars_To_One_Account){
        
        AddCalendarTest.AddAccount("Test Account 1");
 
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test"));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", DefaultColour));
        
 }
 
@@ -249,9 +317,9 @@ TEST(CalendarDataStorage, Add_One_Calendar_To_Two_Accounts){
        AddCalendarTest.AddAccount("Test Account 1");
        AddCalendarTest.AddAccount("Test Account 2");
 
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test"));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
        
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test"));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test", DefaultColour));
        
 }
 
@@ -262,11 +330,11 @@ TEST(CalendarDataStorage, Add_Two_Calendars_To_Two_Accounts){
        AddCalendarTest.AddAccount("Test Account 1");
        AddCalendarTest.AddAccount("Test Account 2");
 
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test"));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour));
        
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 2", "calendar2-test"));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 2", "calendar2-test", DefaultColour));
        
 }
 
@@ -277,13 +345,13 @@ TEST(CalendarDataStorage, Add_Three_Calendars_To_Two_Accounts){
        AddCalendarTest.AddAccount("Test Account 1");
        AddCalendarTest.AddAccount("Test Account 2");
 
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test"));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", DefaultColour));
 
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 2", "calendar2-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 3", "calendar3-test"));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 2", "calendar2-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 3", "calendar3-test", DefaultColour));
        
 }
 
@@ -295,11 +363,11 @@ TEST(CalendarDataStorage, Add_One_Calendar_To_Three_Accounts){
        AddCalendarTest.AddAccount("Test Account 2");
        AddCalendarTest.AddAccount("Test Account 3");
 
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test"));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
        
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test"));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test", DefaultColour));
        
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 1", "calendar1-test"));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 1", "calendar1-test", DefaultColour));
        
 }
 
@@ -311,14 +379,14 @@ TEST(CalendarDataStorage, Add_Two_Calendars_To_Three_Accounts){
        AddCalendarTest.AddAccount("Test Account 2");
        AddCalendarTest.AddAccount("Test Account 3");
 
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test"));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour));
        
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 2", "calendar2-test"));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 2", "calendar2-test", DefaultColour));
 
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 1", "calendar1-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 2", "calendar2-test"));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 2", "calendar2-test", DefaultColour));
        
 }
 
@@ -330,17 +398,17 @@ TEST(CalendarDataStorage, Add_Three_Calendars_To_Three_Accounts){
        AddCalendarTest.AddAccount("Test Account 2");
        AddCalendarTest.AddAccount("Test Account 3");
 
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test"));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", DefaultColour));
 
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 2", "calendar2-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 3", "calendar3-test"));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 2", "calendar2-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 3", "calendar3-test", DefaultColour));
 
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 1", "calendar1-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 2", "calendar2-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 3", "calendar3-test"));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 2", "calendar2-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 3", "calendar3-test", DefaultColour));
        
 }
 
@@ -350,9 +418,9 @@ TEST(CalendarDataStorage, Get_Calendar_Information_From_One_Account){
        
        GetCalendarTest.AddAccount("Test Account 1");   
 
-       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test"));
+       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", DefaultColour));
        
        CDSGetCalendarInfo calendar1Info;
        CDSGetCalendarInfo calendar2Info;
@@ -399,13 +467,13 @@ TEST(CalendarDataStorage, Get_Calendar_Information_From_Two_Accounts){
        GetCalendarTest.AddAccount("Test Account 1");
        GetCalendarTest.AddAccount("Test Account 2");
 
-       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test"));
+       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", DefaultColour));
 
-       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 2", "calendar2-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 3", "calendar3-test"));
+       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 2", "calendar2-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 3", "calendar3-test", DefaultColour));
        
        CDSGetCalendarInfo calendar1Info;
        CDSGetCalendarInfo calendar2Info;
@@ -489,17 +557,17 @@ TEST(CalendarDataStorage, Get_Calendar_Information_From_Three_Accounts){
        GetCalendarTest.AddAccount("Test Account 2");
        GetCalendarTest.AddAccount("Test Account 3");
 
-       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test"));
+       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", DefaultColour));
 
-       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 2", "calendar2-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 3", "calendar3-test"));
+       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 2", "calendar2-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 3", "calendar3-test", DefaultColour));
 
-       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 1", "calendar1-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 2", "calendar2-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 3", "calendar3-test"));
+       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 2", "calendar2-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 3", "calendar3-test", DefaultColour));
        
        CDSGetCalendarInfo calendar1Info;
        CDSGetCalendarInfo calendar2Info;
@@ -617,7 +685,7 @@ TEST(CalendarDataStorage, Update_One_Calendar_With_One_Account){
        
        UpdateCalendarTest.AddAccount("Test Account 1");
 
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
        
        CDSGetCalendarInfo calendar1Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test");
        
@@ -633,8 +701,8 @@ TEST(CalendarDataStorage, Update_One_Calendar_With_Two_Accounts){
        UpdateCalendarTest.AddAccount("Test Account 1");
        UpdateCalendarTest.AddAccount("Test Account 2");
 
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test", DefaultColour));
        
        CDSGetCalendarInfo calendar1Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test");
        CDSGetCalendarInfo calendar2Info = UpdateCalendarTest.GetCalendar("Test Account 2", "calendar1-test");
@@ -655,9 +723,9 @@ TEST(CalendarDataStorage, Update_One_Calendar_With_Three_Accounts){
        UpdateCalendarTest.AddAccount("Test Account 2");
        UpdateCalendarTest.AddAccount("Test Account 3");        
 
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 1", "calendar1-test"));   
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 1", "calendar1-test", DefaultColour));    
        
        CDSGetCalendarInfo calendar1Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test");
        CDSGetCalendarInfo calendar2Info = UpdateCalendarTest.GetCalendar("Test Account 2", "calendar1-test");
@@ -679,8 +747,8 @@ TEST(CalendarDataStorage, Update_Two_Calendars_With_One_Account){
        
        UpdateCalendarTest.AddAccount("Test Account 1");
 
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour));
        
        CDSGetCalendarInfo calendar1Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test");
        CDSGetCalendarInfo calendar2Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar2-test");
@@ -700,10 +768,10 @@ TEST(CalendarDataStorage, Update_Two_Calendars_With_Two_Accounts){
        UpdateCalendarTest.AddAccount("Test Account 1");
        UpdateCalendarTest.AddAccount("Test Account 2");
 
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 3", "calendar1-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 4", "calendar2-test"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 3", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 4", "calendar2-test", DefaultColour));
        
        CDSGetCalendarInfo calendar1Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test");
        CDSGetCalendarInfo calendar2Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar2-test");
@@ -730,12 +798,12 @@ TEST(CalendarDataStorage, Update_Two_Calendars_With_Three_Accounts){
        UpdateCalendarTest.AddAccount("Test Account 2");
        UpdateCalendarTest.AddAccount("Test Account 3");
 
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 3", "calendar1-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 4", "calendar2-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 5", "calendar1-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 6", "calendar2-test"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 3", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 4", "calendar2-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 5", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 6", "calendar2-test", DefaultColour));
        
        CDSGetCalendarInfo calendar1Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test");
        CDSGetCalendarInfo calendar2Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar2-test");
@@ -767,9 +835,9 @@ TEST(CalendarDataStorage, Update_Three_Calendars_With_One_Account){
        
        UpdateCalendarTest.AddAccount("Test Account 1");
 
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", DefaultColour));
        
        CDSGetCalendarInfo calendar1Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test");
        CDSGetCalendarInfo calendar2Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar2-test");
@@ -792,12 +860,12 @@ TEST(CalendarDataStorage, Update_Three_Calendars_With_Two_Accounts){
        UpdateCalendarTest.AddAccount("Test Account 1");
        UpdateCalendarTest.AddAccount("Test Account 2");
 
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 4", "calendar1-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 5", "calendar2-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 6", "calendar3-test"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 4", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 5", "calendar2-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 6", "calendar3-test", DefaultColour));
        
        CDSGetCalendarInfo calendar1Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test");
        CDSGetCalendarInfo calendar2Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar2-test");
@@ -830,15 +898,15 @@ TEST(CalendarDataStorage, Update_Three_Calendars_With_Three_Accounts){
        UpdateCalendarTest.AddAccount("Test Account 2");
        UpdateCalendarTest.AddAccount("Test Account 3");
 
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 4", "calendar1-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 5", "calendar2-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 6", "calendar3-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 7", "calendar1-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 8", "calendar2-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 9", "calendar3-test"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 4", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 5", "calendar2-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 6", "calendar3-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 7", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 8", "calendar2-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 9", "calendar3-test", DefaultColour));
        
        CDSGetCalendarInfo calendar1Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test");
        CDSGetCalendarInfo calendar2Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar2-test");
@@ -879,7 +947,7 @@ TEST(CalendarDataStorage, Delete_One_Calendar){
        
        DeleteCalendarTest.AddAccount("Test Account 1");
        
-       ASSERT_EQ(CDSCALENDAR_OK, DeleteCalendarTest.AddCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test"));
+       ASSERT_EQ(CDSCALENDAR_OK, DeleteCalendarTest.AddCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
        
        calendarID = DeleteCalendarTest.GetCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountName, "calendar1-test").calendarID;
        
@@ -896,8 +964,8 @@ TEST(CalendarDataStorage, Delete_Two_Calendars){
        DeleteCalendarTest.AddAccount("Test Account 1");
        DeleteCalendarTest.AddAccount("Test Account 2");        
        
-       ASSERT_EQ(CDSCALENDAR_OK, DeleteCalendarTest.AddCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, DeleteCalendarTest.AddCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test"));
+       ASSERT_EQ(CDSCALENDAR_OK, DeleteCalendarTest.AddCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, DeleteCalendarTest.AddCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour));
        
        calendarID1 = DeleteCalendarTest.GetCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountName, "calendar1-test").calendarID;
        calendarID2 = DeleteCalendarTest.GetCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountName, "calendar2-test").calendarID;
@@ -918,9 +986,9 @@ TEST(CalendarDataStorage, Delete_Three_Calendars){
        DeleteCalendarTest.AddAccount("Test Account 2");
        DeleteCalendarTest.AddAccount("Test Account 3");
        
-       ASSERT_EQ(CDSCALENDAR_OK, DeleteCalendarTest.AddCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, DeleteCalendarTest.AddCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test"));
-       ASSERT_EQ(CDSCALENDAR_OK, DeleteCalendarTest.AddCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test"));
+       ASSERT_EQ(CDSCALENDAR_OK, DeleteCalendarTest.AddCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, DeleteCalendarTest.AddCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, DeleteCalendarTest.AddCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", DefaultColour));
        
        calendarID1 = DeleteCalendarTest.GetCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountName, "calendar1-test").calendarID;
        calendarID2 = DeleteCalendarTest.GetCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountName, "calendar2-test").calendarID;
@@ -937,7 +1005,7 @@ TEST(CalendarDataStorage, Add_One_Event){
        CalendarDataStorage AddEventTest;
        
        AddEventTest.AddAccount("Test Account 1");
-       AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test");
+       AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
        
        CDSAddEntryResult addEventResult = AddEventTest.AddEvent(1, "CalendarEvent1.ics");
        
@@ -951,7 +1019,7 @@ TEST(CalendarDataStorage, Add_Two_Events){
        CalendarDataStorage AddEventTest;
        
        AddEventTest.AddAccount("Test Account 1");
-       AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test");
+       AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
        
        CDSAddEntryResult addEvent1Result = AddEventTest.AddEvent(1, "CalendarEvent1.ics");
        
@@ -970,7 +1038,7 @@ TEST(CalendarDataStorage, Add_Three_Events){
        CalendarDataStorage AddEventTest;
        
        AddEventTest.AddAccount("Test Account 1");
-       AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test");
+       AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
        
        CDSAddEntryResult addEvent1Result = AddEventTest.AddEvent(1, "CalendarEvent1.ics");
        
@@ -994,7 +1062,7 @@ TEST(CalendarDataStorage, Add_One_Event_And_Get_Event_Basic_Information){
        CalendarDataStorage AddEventTest;       
 
        AddEventTest.AddAccount("Test Account 1");
-       AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test");
+       AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
        CDSAddEntryResult addEventResult = AddEventTest.AddEvent(1, "CalendarEvent1.ics");
        
        // Get the entry information.
@@ -1024,7 +1092,7 @@ TEST(CalendarDataStorage, Add_One_Event_And_Get_Event_Basic_Information_With_Dur
        CalendarDataStorage AddEventTest;       
 
        AddEventTest.AddAccount("Test Account 1");
-       AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test");
+       AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
        CDSAddEntryResult addEventResult = AddEventTest.AddEvent(1, "CalendarEvent2.ics");
        
        EXPECT_EQ(CDSENTRY_OK, addEventResult.addEventResult);
@@ -1061,7 +1129,7 @@ TEST(CalendarDataStorage, Add_Two_Events_And_Get_Event_Basic_Information){
        CalendarDataStorage AddEventTest;       
 
        AddEventTest.AddAccount("Test Account 1");
-       AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test");
+       AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
        CDSAddEntryResult addEvent1Result = AddEventTest.AddEvent(1, "CalendarEvent1.ics");
        CDSAddEntryResult addEvent2Result = AddEventTest.AddEvent(1, "CalendarEvent2.ics");
        
@@ -1117,7 +1185,7 @@ TEST(CalendarDataStorage, Add_The_Same_Three_Events_And_Get_Event_Information){
        CalendarDataStorage AddEventTest;
 
        AddEventTest.AddAccount("Test Account 1");
-       AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test");
+       AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
        CDSAddEntryResult addEvent1Result = AddEventTest.AddEvent(1, "CalendarEvent1.ics");
        CDSAddEntryResult addEvent2Result = AddEventTest.AddEvent(1, "CalendarEvent1.ics");
        CDSAddEntryResult addEvent3Result = AddEventTest.AddEvent(1, "CalendarEvent1.ics");
@@ -1188,7 +1256,7 @@ TEST(CalendarDataStorage, Add_Three_Events_And_Get_Event_Information){
        CalendarDataStorage AddEventTest;
 
        AddEventTest.AddAccount("Test Account 1");
-       AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test");
+       AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
        CDSAddEntryResult addEvent1Result = AddEventTest.AddEvent(1, "CalendarEvent1.ics");
        CDSAddEntryResult addEvent2Result = AddEventTest.AddEvent(1, "CalendarEvent2.ics");
        CDSAddEntryResult addEvent3Result = AddEventTest.AddEvent(1, "CalendarEvent3.ics");
@@ -1264,7 +1332,7 @@ TEST(CalendarDataStorage, Delete_One_Event){
        CalendarDataStorage DeleteEventTest;
 
        DeleteEventTest.AddAccount("Test Account 1");
-       DeleteEventTest.AddCalendar(1, "Calendar 1", "calendar1-test");
+       DeleteEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
        CDSAddEntryResult addEventResult = DeleteEventTest.AddEvent(1, "CalendarEvent1.ics");
        
        EXPECT_EQ(CDSENTRY_OK, addEventResult.addEventResult);
@@ -1278,7 +1346,7 @@ TEST(CalendarDataStorage, Delete_Two_Events){
        CalendarDataStorage DeleteEventTest;
 
        DeleteEventTest.AddAccount("Test Account 1");
-       DeleteEventTest.AddCalendar(1, "Calendar 1", "calendar1-test");
+       DeleteEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
        CDSAddEntryResult addEvent1Result = DeleteEventTest.AddEvent(1, "CalendarEvent1.ics");
        CDSAddEntryResult addEvent2Result = DeleteEventTest.AddEvent(1, "CalendarEvent2.ics");
        
@@ -1295,7 +1363,7 @@ TEST(CalendarDataStorage, Delete_Three_Events){
        CalendarDataStorage DeleteEventTest;
 
        DeleteEventTest.AddAccount("Test Account 1");
-       DeleteEventTest.AddCalendar(1, "Calendar 1", "calendar1-test");
+       DeleteEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
        CDSAddEntryResult addEvent1Result = DeleteEventTest.AddEvent(1, "CalendarEvent1.ics");
        CDSAddEntryResult addEvent2Result = DeleteEventTest.AddEvent(1, "CalendarEvent2.ics");
        CDSAddEntryResult addEvent3Result = DeleteEventTest.AddEvent(1, "CalendarEvent3.ics");
@@ -1315,7 +1383,7 @@ TEST(CalendarDataStorage, Delete_One_Calendar_And_Events){
        CalendarDataStorage DeleteEventTest;
        
        DeleteEventTest.AddAccount("Test Account 1");
-       DeleteEventTest.AddCalendar(1, "Calendar 1", "calendar1-test");
+       DeleteEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
        CDSAddEntryResult addEvent1Result = DeleteEventTest.AddEvent(1, "CalendarEvent1.ics");
        CDSAddEntryResult addEvent2Result = DeleteEventTest.AddEvent(1, "CalendarEvent2.ics");
        CDSAddEntryResult addEvent3Result = DeleteEventTest.AddEvent(1, "CalendarEvent3.ics");
@@ -1333,8 +1401,8 @@ TEST(CalendarDataStorage, Delete_Two_Calendars_And_Events){
        CalendarDataStorage DeleteEventTest;
        
        DeleteEventTest.AddAccount("Test Account 1");
-       DeleteEventTest.AddCalendar(1, "Calendar 1", "calendar1-test");
-       DeleteEventTest.AddCalendar(1, "Calendar 1", "calendar2-test");
+       DeleteEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
+       DeleteEventTest.AddCalendar(1, "Calendar 1", "calendar2-test", DefaultColour);
 
        // Setup and delete the first calendar.
        
@@ -1367,9 +1435,9 @@ TEST(CalendarDataStorage, Delete_Three_Calendars_And_Events){
        CalendarDataStorage DeleteEventTest;
        
        DeleteEventTest.AddAccount("Test Account 1");
-       DeleteEventTest.AddCalendar(1, "Calendar 1", "calendar1-test");
-       DeleteEventTest.AddCalendar(1, "Calendar 2", "calendar2-test");
-       DeleteEventTest.AddCalendar(1, "Calendar 3", "calendar3-test");
+       DeleteEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
+       DeleteEventTest.AddCalendar(1, "Calendar 2", "calendar2-test", DefaultColour);
+       DeleteEventTest.AddCalendar(1, "Calendar 3", "calendar3-test", DefaultColour);
 
        // Setup and delete the first calendar.
        
@@ -1414,7 +1482,7 @@ TEST(CalendarDataStorage, Delete_One_Account_And_Associated_Data){
        CalendarDataStorage DeleteAccountTest;
        
        DeleteAccountTest.AddAccount("Test Account 1");
-       DeleteAccountTest.AddCalendar(1, "Calendar 1", "calendar1-test");
+       DeleteAccountTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
 
        // Setup and delete the first account.
        
@@ -1442,9 +1510,9 @@ TEST(CalendarDataStorage, Delete_Two_Accounts_And_Associated_Data){
 
        // Setup and delete the first account.
        
-       DeleteAccountTest.AddCalendar(1, "Calendar 1", "calendar1-test");
-       DeleteAccountTest.AddCalendar(1, "Calendar 2", "calendar1-test");
-       DeleteAccountTest.AddCalendar(1, "Calendar 3", "calendar1-test");
+       DeleteAccountTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
+       DeleteAccountTest.AddCalendar(1, "Calendar 2", "calendar1-test", DefaultColour);
+       DeleteAccountTest.AddCalendar(1, "Calendar 3", "calendar1-test", DefaultColour);
        
        CDSAddEntryResult addEvent1Result = DeleteAccountTest.AddEvent(1, "CalendarEvent1.ics");
        CDSAddEntryResult addEvent2Result = DeleteAccountTest.AddEvent(1, "CalendarEvent2.ics");
@@ -1460,9 +1528,9 @@ TEST(CalendarDataStorage, Delete_Two_Accounts_And_Associated_Data){
 
        // Setup and delete the second account.
        
-       DeleteAccountTest.AddCalendar(2, "Calendar 1", "calendar1-test");
-       DeleteAccountTest.AddCalendar(2, "Calendar 2", "calendar1-test");
-       DeleteAccountTest.AddCalendar(2, "Calendar 3", "calendar1-test");
+       DeleteAccountTest.AddCalendar(2, "Calendar 1", "calendar1-test", DefaultColour);
+       DeleteAccountTest.AddCalendar(2, "Calendar 2", "calendar1-test", DefaultColour);
+       DeleteAccountTest.AddCalendar(2, "Calendar 3", "calendar1-test", DefaultColour);
        
        addEvent1Result = DeleteAccountTest.AddEvent(4, "CalendarEvent1.ics");
        addEvent2Result = DeleteAccountTest.AddEvent(4, "CalendarEvent2.ics");
@@ -1488,9 +1556,9 @@ TEST(CalendarDataStorage, Delete_Three_Accounts_And_Associated_Data){
 
        // Setup and delete the first account.
        
-       DeleteAccountTest.AddCalendar(1, "Calendar 1", "calendar1-test");
-       DeleteAccountTest.AddCalendar(1, "Calendar 2", "calendar1-test");
-       DeleteAccountTest.AddCalendar(1, "Calendar 3", "calendar1-test");
+       DeleteAccountTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
+       DeleteAccountTest.AddCalendar(1, "Calendar 2", "calendar1-test", DefaultColour);
+       DeleteAccountTest.AddCalendar(1, "Calendar 3", "calendar1-test", DefaultColour);
        
        CDSAddEntryResult addEvent1Result = DeleteAccountTest.AddEvent(1, "CalendarEvent1.ics");
        CDSAddEntryResult addEvent2Result = DeleteAccountTest.AddEvent(1, "CalendarEvent2.ics");
@@ -1506,9 +1574,9 @@ TEST(CalendarDataStorage, Delete_Three_Accounts_And_Associated_Data){
 
        // Setup and delete the second account.
        
-       DeleteAccountTest.AddCalendar(2, "Calendar 1", "calendar1-test");
-       DeleteAccountTest.AddCalendar(2, "Calendar 2", "calendar1-test");
-       DeleteAccountTest.AddCalendar(2, "Calendar 3", "calendar1-test");
+       DeleteAccountTest.AddCalendar(2, "Calendar 1", "calendar1-test", DefaultColour);
+       DeleteAccountTest.AddCalendar(2, "Calendar 2", "calendar1-test", DefaultColour);
+       DeleteAccountTest.AddCalendar(2, "Calendar 3", "calendar1-test", DefaultColour);
        
        addEvent1Result = DeleteAccountTest.AddEvent(4, "CalendarEvent1.ics");
        addEvent2Result = DeleteAccountTest.AddEvent(4, "CalendarEvent2.ics");
@@ -1524,9 +1592,9 @@ TEST(CalendarDataStorage, Delete_Three_Accounts_And_Associated_Data){
 
        // Setup and delete the third account.
        
-       DeleteAccountTest.AddCalendar(3, "Calendar 1", "calendar1-test");
-       DeleteAccountTest.AddCalendar(3, "Calendar 2", "calendar1-test");
-       DeleteAccountTest.AddCalendar(3, "Calendar 3", "calendar1-test");
+       DeleteAccountTest.AddCalendar(3, "Calendar 1", "calendar1-test", DefaultColour);
+       DeleteAccountTest.AddCalendar(3, "Calendar 2", "calendar1-test", DefaultColour);
+       DeleteAccountTest.AddCalendar(3, "Calendar 3", "calendar1-test", DefaultColour);
        
        addEvent1Result = DeleteAccountTest.AddEvent(7, "CalendarEvent1.ics");
        addEvent2Result = DeleteAccountTest.AddEvent(7, "CalendarEvent2.ics");
@@ -1550,9 +1618,9 @@ TEST(CalendarDataStorage, Get_List_Of_Events_For_One_Account){
 
        // Setup and delete the first account.
        
-       GetEventsListTest.AddCalendar(1, "Calendar 1", "calendar1-test");
-       GetEventsListTest.AddCalendar(1, "Calendar 2", "calendar1-test");
-       GetEventsListTest.AddCalendar(1, "Calendar 3", "calendar1-test");
+       GetEventsListTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
+       GetEventsListTest.AddCalendar(1, "Calendar 2", "calendar1-test", DefaultColour);
+       GetEventsListTest.AddCalendar(1, "Calendar 3", "calendar1-test", DefaultColour);
        
        CDSAddEntryResult addEvent1Result = GetEventsListTest.AddEvent(1, "CalendarEvent1.ics");
        CDSAddEntryResult addEvent2Result = GetEventsListTest.AddEvent(1, "CalendarEvent2.ics");
@@ -1574,9 +1642,9 @@ TEST(CalendarDataStorage, Get_List_Of_Events_For_Two_Accounts){
 
        // Setup and delete the first account.
        
-       GetEventsListTest.AddCalendar(1, "Calendar 1", "calendar1-test");
-       GetEventsListTest.AddCalendar(1, "Calendar 2", "calendar1-test");
-       GetEventsListTest.AddCalendar(1, "Calendar 3", "calendar1-test");
+       GetEventsListTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
+       GetEventsListTest.AddCalendar(1, "Calendar 2", "calendar1-test", DefaultColour);
+       GetEventsListTest.AddCalendar(1, "Calendar 3", "calendar1-test", DefaultColour);
        
        // Setup the first account.
        
@@ -1612,9 +1680,9 @@ TEST(CalendarDataStorage, Get_List_Of_Events_For_Three_Accounts){
 
        // Setup and delete the first account.
        
-       GetEventsListTest.AddCalendar(1, "Calendar 1", "calendar1-test");
-       GetEventsListTest.AddCalendar(1, "Calendar 2", "calendar1-test");
-       GetEventsListTest.AddCalendar(1, "Calendar 3", "calendar1-test");
+       GetEventsListTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
+       GetEventsListTest.AddCalendar(1, "Calendar 2", "calendar1-test", DefaultColour);
+       GetEventsListTest.AddCalendar(1, "Calendar 3", "calendar1-test", DefaultColour);
        
        // Setup the first account.
        
@@ -1659,12 +1727,12 @@ TEST(CalendarDataStorage, Get_List_Of_Calendars_For_One_Account){
        CalendarDataStorage GetEventsListTest;
        
        GetEventsListTest.AddAccount("Test Account 1");
-
+       
        // Setup the first account.
        
-       GetEventsListTest.AddCalendar(1, "Calendar 1", "calendar1-test");
-       GetEventsListTest.AddCalendar(1, "Calendar 2", "calendar2-test");
-       GetEventsListTest.AddCalendar(1, "Calendar 3", "calendar3-test");
+       GetEventsListTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
+       GetEventsListTest.AddCalendar(1, "Calendar 2", "calendar2-test", DefaultColour);
+       GetEventsListTest.AddCalendar(1, "Calendar 3", "calendar3-test", DefaultColour);
        
        // Get the list of calendar IDs.
        
@@ -1686,12 +1754,12 @@ TEST(CalendarDataStorage, Get_List_Of_Calendars_For_Two_Accounts){
        
        GetEventsListTest.AddAccount("Test Account 1");
        GetEventsListTest.AddAccount("Test Account 2");
-
+       
        // Setup the first account.
        
-       GetEventsListTest.AddCalendar(1, "Calendar 1", "calendar1-test");
-       GetEventsListTest.AddCalendar(1, "Calendar 2", "calendar2-test");
-       GetEventsListTest.AddCalendar(1, "Calendar 3", "calendar3-test");
+       GetEventsListTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
+       GetEventsListTest.AddCalendar(1, "Calendar 2", "calendar2-test", DefaultColour);
+       GetEventsListTest.AddCalendar(1, "Calendar 3", "calendar3-test", DefaultColour);
        
        // Get the list of calendar IDs.
        
@@ -1707,9 +1775,9 @@ TEST(CalendarDataStorage, Get_List_Of_Calendars_For_Two_Accounts){
        
        // Setup the second account.
        
-       GetEventsListTest.AddCalendar(2, "Calendar 4", "calendar4-test");
-       GetEventsListTest.AddCalendar(2, "Calendar 5", "calendar5-test");
-       GetEventsListTest.AddCalendar(2, "Calendar 6", "calendar6-test");
+       GetEventsListTest.AddCalendar(2, "Calendar 4", "calendar4-test", DefaultColour);
+       GetEventsListTest.AddCalendar(2, "Calendar 5", "calendar5-test", DefaultColour);
+       GetEventsListTest.AddCalendar(2, "Calendar 6", "calendar6-test", DefaultColour);
 
        calendarList = GetEventsListTest.GetCalendarList(2);
 
@@ -1730,12 +1798,12 @@ TEST(CalendarDataStorage, Get_List_Of_Calendars_For_Three_Accounts){
        GetEventsListTest.AddAccount("Test Account 1");
        GetEventsListTest.AddAccount("Test Account 2");
        GetEventsListTest.AddAccount("Test Account 3");
-
+       
        // Setup the first account.
        
-       GetEventsListTest.AddCalendar(1, "Calendar 1", "calendar1-test");
-       GetEventsListTest.AddCalendar(1, "Calendar 2", "calendar2-test");
-       GetEventsListTest.AddCalendar(1, "Calendar 3", "calendar3-test");
+       GetEventsListTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
+       GetEventsListTest.AddCalendar(1, "Calendar 2", "calendar2-test", DefaultColour);
+       GetEventsListTest.AddCalendar(1, "Calendar 3", "calendar3-test", DefaultColour);
        
        // Get the list of calendar IDs.
        
@@ -1751,9 +1819,9 @@ TEST(CalendarDataStorage, Get_List_Of_Calendars_For_Three_Accounts){
        
        // Setup the second account.
        
-       GetEventsListTest.AddCalendar(2, "Calendar 4", "calendar4-test");
-       GetEventsListTest.AddCalendar(2, "Calendar 5", "calendar5-test");
-       GetEventsListTest.AddCalendar(2, "Calendar 6", "calendar6-test");
+       GetEventsListTest.AddCalendar(2, "Calendar 4", "calendar4-test", DefaultColour);
+       GetEventsListTest.AddCalendar(2, "Calendar 5", "calendar5-test", DefaultColour);
+       GetEventsListTest.AddCalendar(2, "Calendar 6", "calendar6-test", DefaultColour);
 
        calendarList = GetEventsListTest.GetCalendarList(2);
 
@@ -1767,9 +1835,9 @@ TEST(CalendarDataStorage, Get_List_Of_Calendars_For_Three_Accounts){
 
        // Setup the third account.
        
-       GetEventsListTest.AddCalendar(3, "Calendar 7", "calendar7-test");
-       GetEventsListTest.AddCalendar(3, "Calendar 8", "calendar8-test");
-       GetEventsListTest.AddCalendar(3, "Calendar 9", "calendar9-test");
+       GetEventsListTest.AddCalendar(3, "Calendar 7", "calendar7-test", DefaultColour);
+       GetEventsListTest.AddCalendar(3, "Calendar 8", "calendar8-test", DefaultColour);
+       GetEventsListTest.AddCalendar(3, "Calendar 9", "calendar9-test", DefaultColour);
 
        calendarList = GetEventsListTest.GetCalendarList(3);