X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Ftests%2Fxestiacalendar_calendardatastorage.h;h=9b04282732fe10de79d6d9057e5820c6df18b3d4;hb=2e304ff435c80c07daaf0d3fbe8a9ab7d1ae70b1;hp=129533e80c2b73075437f815597f7742b3782227;hpb=51c291353798e0081c475d7e6f9c13c84c147a16;p=xestiacalendar%2F.git diff --git a/source/tests/xestiacalendar_calendardatastorage.h b/source/tests/xestiacalendar_calendardatastorage.h index 129533e..9b04282 100644 --- a/source/tests/xestiacalendar_calendardatastorage.h +++ b/source/tests/xestiacalendar_calendardatastorage.h @@ -1,14 +1,14 @@ // xestiacalendar_calendardatastorage.h - Xestia Calendar Calendar Data Storage Unit Tests // -// (c) 2016 Xestia Software Development. +// (c) 2016-2017 Xestia Software Development. // // This file is part of Xestia Calendar. // -// Xestia Address Book is free software: you can redistribute it and/or modify +// Xestia Calendar is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by the // Free Software Foundation, version 3 of the license. // -// Xestia Address Book is distributed in the hope that it will be useful, +// Xestia Calendar is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. @@ -18,349 +18,428 @@ #include "../libraries/CalendarDataStorage/CalendarDataStorage.h" +Colour defaultColour; + TEST(CalendarDataStorage, Setup_Tables){ - CalendarDataStorage SetupTablesTest; + CalendarDataStorage setupTablesTest; - ASSERT_EQ(true, SetupTablesTest.DidInitOK()); + ASSERT_EQ(true, setupTablesTest.DidInitOK()); } TEST(CalendarDataStorage, Add_One_Account){ - CalendarDataStorage AddOneEntryTest; + CalendarDataStorage addOneEntryTest; - ASSERT_EQ(CDSACCOUNT_OK, AddOneEntryTest.AddAccount("Test Account 1")); + ASSERT_EQ(CDSACCOUNT_OK, addOneEntryTest.AddAccount("Test Account 1", 1)); } TEST(CalendarDataStorage, Add_Two_Accounts){ - CalendarDataStorage AddTwoEntryTest; + CalendarDataStorage addTwoEntryTest; - ASSERT_EQ(CDSACCOUNT_OK, AddTwoEntryTest.AddAccount("Test Account 1")); - ASSERT_EQ(CDSACCOUNT_OK, AddTwoEntryTest.AddAccount("Test Account 2")); + ASSERT_EQ(CDSACCOUNT_OK, addTwoEntryTest.AddAccount("Test Account 1", 1)); + ASSERT_EQ(CDSACCOUNT_OK, addTwoEntryTest.AddAccount("Test Account 2", 2)); } TEST(CalendarDataStorage, Add_Three_Accounts){ - CalendarDataStorage AddThreeEntryTest; + CalendarDataStorage addThreeEntryTest; - ASSERT_EQ(CDSACCOUNT_OK, AddThreeEntryTest.AddAccount("Test Account 1")); - ASSERT_EQ(CDSACCOUNT_OK, AddThreeEntryTest.AddAccount("Test Account 2")); - ASSERT_EQ(CDSACCOUNT_OK, AddThreeEntryTest.AddAccount("Test Account 3")); + ASSERT_EQ(CDSACCOUNT_OK, addThreeEntryTest.AddAccount("Test Account 1", 1)); + ASSERT_EQ(CDSACCOUNT_OK, addThreeEntryTest.AddAccount("Test Account 2", 2)); + ASSERT_EQ(CDSACCOUNT_OK, addThreeEntryTest.AddAccount("Test Account 3", 3)); } TEST(CalendarDataStorage, Get_Account_Information){ - CalendarDataStorage AccountInformationTest; + CalendarDataStorage accountInformationTest; - AccountInformationTest.AddAccount("Test Account 1"); - ASSERT_EQ(CDSACCOUNT_OK, AccountInformationTest.GetAccount("Test Account 1").accountInfoResult); - ASSERT_EQ("Test Account 1", AccountInformationTest.GetAccount("Test Account 1").accountName); - ASSERT_EQ(1, AccountInformationTest.GetAccount("Test Account 1").accountID); + accountInformationTest.AddAccount("Test Account 1", 1); + ASSERT_EQ(CDSACCOUNT_OK, accountInformationTest.GetAccount("Test Account 1").accountInfoResult); + ASSERT_EQ("Test Account 1", accountInformationTest.GetAccount("Test Account 1").accountName); + ASSERT_EQ(1, accountInformationTest.GetAccount("Test Account 1").accountID); } TEST(CalendarDataStorage, Get_Two_Accounts_Information){ - CalendarDataStorage AccountInformationTest; + CalendarDataStorage accountInformationTest; - AccountInformationTest.AddAccount("Test Account 1"); - AccountInformationTest.AddAccount("Test Account 2"); + accountInformationTest.AddAccount("Test Account 1", 1); + accountInformationTest.AddAccount("Test Account 2", 2); - ASSERT_EQ(CDSACCOUNT_OK, AccountInformationTest.GetAccount("Test Account 1").accountInfoResult); - ASSERT_EQ("Test Account 1", AccountInformationTest.GetAccount("Test Account 1").accountName); - ASSERT_EQ(1, AccountInformationTest.GetAccount("Test Account 1").accountID); + ASSERT_EQ(CDSACCOUNT_OK, accountInformationTest.GetAccount("Test Account 1").accountInfoResult); + ASSERT_EQ("Test Account 1", accountInformationTest.GetAccount("Test Account 1").accountName); + ASSERT_EQ(1, accountInformationTest.GetAccount("Test Account 1").accountID); + ASSERT_EQ(1, accountInformationTest.GetAccount("Test Account 1").accountPreferencesID); - ASSERT_EQ(CDSACCOUNT_OK, AccountInformationTest.GetAccount("Test Account 2").accountInfoResult); - ASSERT_EQ("Test Account 2", AccountInformationTest.GetAccount("Test Account 2").accountName); - ASSERT_EQ(2, AccountInformationTest.GetAccount("Test Account 2").accountID); + ASSERT_EQ(CDSACCOUNT_OK, accountInformationTest.GetAccount("Test Account 2").accountInfoResult); + ASSERT_EQ("Test Account 2", accountInformationTest.GetAccount("Test Account 2").accountName); + ASSERT_EQ(2, accountInformationTest.GetAccount("Test Account 2").accountID); + ASSERT_EQ(2, accountInformationTest.GetAccount("Test Account 2").accountPreferencesID); } TEST(CalendarDataStorage, Get_Three_Accounts_Information){ - CalendarDataStorage AccountInformationTest; + CalendarDataStorage accountInformationTest; + + accountInformationTest.AddAccount("Test Account 1", 1); + accountInformationTest.AddAccount("Test Account 2", 2); + accountInformationTest.AddAccount("Test Account 3", 3); + + ASSERT_EQ(CDSACCOUNT_OK, accountInformationTest.GetAccount("Test Account 1").accountInfoResult); + ASSERT_EQ("Test Account 1", accountInformationTest.GetAccount("Test Account 1").accountName); + ASSERT_EQ(1, accountInformationTest.GetAccount("Test Account 1").accountID); + ASSERT_EQ(1, accountInformationTest.GetAccount("Test Account 1").accountPreferencesID); + + ASSERT_EQ(CDSACCOUNT_OK, accountInformationTest.GetAccount("Test Account 2").accountInfoResult); + ASSERT_EQ("Test Account 2", accountInformationTest.GetAccount("Test Account 2").accountName); + ASSERT_EQ(2, accountInformationTest.GetAccount("Test Account 2").accountID); + ASSERT_EQ(2, accountInformationTest.GetAccount("Test Account 2").accountPreferencesID); + + ASSERT_EQ(CDSACCOUNT_OK, accountInformationTest.GetAccount("Test Account 3").accountInfoResult); + ASSERT_EQ("Test Account 3", accountInformationTest.GetAccount("Test Account 3").accountName); + ASSERT_EQ(3, accountInformationTest.GetAccount("Test Account 3").accountID); + ASSERT_EQ(3, accountInformationTest.GetAccount("Test Account 3").accountPreferencesID); + +} + +TEST(CalendarDataStorage, Get_List_Of_One_Account){ + + CalendarDataStorage accountInformationTest; + + accountInformationTest.AddAccount("Test Account 1", 1); - AccountInformationTest.AddAccount("Test Account 1"); - AccountInformationTest.AddAccount("Test Account 2"); - AccountInformationTest.AddAccount("Test Account 3"); + CDSAccountList accountListData = accountInformationTest.GetAccountList(); - ASSERT_EQ(CDSACCOUNT_OK, AccountInformationTest.GetAccount("Test Account 1").accountInfoResult); - ASSERT_EQ("Test Account 1", AccountInformationTest.GetAccount("Test Account 1").accountName); - ASSERT_EQ(1, AccountInformationTest.GetAccount("Test Account 1").accountID); + ASSERT_EQ(1, accountListData.accountList.size()); + ASSERT_EQ(CDSACCOUNT_OK, accountListData.getAccountListResult); - ASSERT_EQ(CDSACCOUNT_OK, AccountInformationTest.GetAccount("Test Account 2").accountInfoResult); - ASSERT_EQ("Test Account 2", AccountInformationTest.GetAccount("Test Account 2").accountName); - ASSERT_EQ(2, AccountInformationTest.GetAccount("Test Account 2").accountID); + 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(1, accountListData.accountList[0].accountPreferencesID); + +} + +TEST(CalendarDataStorage, Get_List_Of_Two_Accounts){ + + CalendarDataStorage accountInformationTest; + + accountInformationTest.AddAccount("Test Account 1", 1); + accountInformationTest.AddAccount("Test Account 2", 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(1, accountListData.accountList[0].accountPreferencesID); + + 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(2, accountListData.accountList[1].accountPreferencesID); + +} - ASSERT_EQ(CDSACCOUNT_OK, AccountInformationTest.GetAccount("Test Account 3").accountInfoResult); - ASSERT_EQ("Test Account 3", AccountInformationTest.GetAccount("Test Account 3").accountName); - ASSERT_EQ(3, AccountInformationTest.GetAccount("Test Account 3").accountID); +TEST(CalendarDataStorage, Get_List_Of_Three_Accounts){ + + CalendarDataStorage accountInformationTest; + + accountInformationTest.AddAccount("Test Account 1", 1); + accountInformationTest.AddAccount("Test Account 2", 2); + accountInformationTest.AddAccount("Test Account 3", 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(1, accountListData.accountList[0].accountPreferencesID); + + 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(2, accountListData.accountList[1].accountPreferencesID); + + ASSERT_EQ(3, accountListData.accountList[2].accountID); + ASSERT_EQ(CDSACCOUNT_OK, accountListData.accountList[2].accountInfoResult); + ASSERT_EQ("Test Account 3", accountListData.accountList[2].accountName); + ASSERT_EQ(3, accountListData.accountList[2].accountPreferencesID); + } TEST(CalendarDataStorage, Update_One_Account){ - CalendarDataStorage UpdateAccountTest; + CalendarDataStorage updateAccountTest; - UpdateAccountTest.AddAccount("Test Account 1"); + updateAccountTest.AddAccount("Test Account 1", 1); - int testAccount1ID = UpdateAccountTest.GetAccount("Test Account 1").accountID; + int testAccount1ID = updateAccountTest.GetAccount("Test Account 1").accountID; EXPECT_EQ(1, testAccount1ID); - ASSERT_EQ(CDSACCOUNT_OK, UpdateAccountTest.UpdateAccount(testAccount1ID, "Test Account 1 - Updated")); - ASSERT_NE(CDSACCOUNT_OK, UpdateAccountTest.GetAccount("Test Account 1").accountInfoResult); - ASSERT_EQ(CDSACCOUNT_OK, UpdateAccountTest.GetAccount("Test Account 1 - Updated").accountInfoResult); + ASSERT_EQ(CDSACCOUNT_OK, updateAccountTest.UpdateAccount(testAccount1ID, "Test Account 1 - Updated")); + ASSERT_NE(CDSACCOUNT_OK, updateAccountTest.GetAccount("Test Account 1").accountInfoResult); + ASSERT_EQ(CDSACCOUNT_OK, updateAccountTest.GetAccount("Test Account 1 - Updated").accountInfoResult); } TEST(CalendarDataStorage, Update_Two_Accounts){ - CalendarDataStorage UpdateAccountTest; + CalendarDataStorage updateAccountTest; - UpdateAccountTest.AddAccount("Test Account 1"); - UpdateAccountTest.AddAccount("Test Account 2"); + updateAccountTest.AddAccount("Test Account 1", 1); + updateAccountTest.AddAccount("Test Account 2", 2); - int testAccount1ID = UpdateAccountTest.GetAccount("Test Account 1").accountID; - int testAccount2ID = UpdateAccountTest.GetAccount("Test Account 2").accountID; + int testAccount1ID = updateAccountTest.GetAccount("Test Account 1").accountID; + int testAccount2ID = updateAccountTest.GetAccount("Test Account 2").accountID; EXPECT_EQ(1, testAccount1ID); EXPECT_EQ(2, testAccount2ID); - ASSERT_EQ(CDSACCOUNT_OK, UpdateAccountTest.UpdateAccount(testAccount1ID, "Test Account 1 - Updated")); - ASSERT_EQ(CDSACCOUNT_OK, UpdateAccountTest.UpdateAccount(testAccount2ID, "Test Account 2 - Updated")); + ASSERT_EQ(CDSACCOUNT_OK, updateAccountTest.UpdateAccount(testAccount1ID, "Test Account 1 - Updated")); + ASSERT_EQ(CDSACCOUNT_OK, updateAccountTest.UpdateAccount(testAccount2ID, "Test Account 2 - Updated")); - ASSERT_NE(CDSACCOUNT_OK, UpdateAccountTest.GetAccount("Test Account 1").accountInfoResult); - ASSERT_EQ(CDSACCOUNT_OK, UpdateAccountTest.GetAccount("Test Account 1 - Updated").accountInfoResult); + ASSERT_NE(CDSACCOUNT_OK, updateAccountTest.GetAccount("Test Account 1").accountInfoResult); + ASSERT_EQ(CDSACCOUNT_OK, updateAccountTest.GetAccount("Test Account 1 - Updated").accountInfoResult); - ASSERT_NE(CDSACCOUNT_OK, UpdateAccountTest.GetAccount("Test Account 2").accountInfoResult); - ASSERT_EQ(CDSACCOUNT_OK, UpdateAccountTest.GetAccount("Test Account 2 - Updated").accountInfoResult); + ASSERT_NE(CDSACCOUNT_OK, updateAccountTest.GetAccount("Test Account 2").accountInfoResult); + ASSERT_EQ(CDSACCOUNT_OK, updateAccountTest.GetAccount("Test Account 2 - Updated").accountInfoResult); } TEST(CalendarDataStorage, Update_Three_Accounts){ - CalendarDataStorage UpdateAccountTest; + CalendarDataStorage updateAccountTest; - UpdateAccountTest.AddAccount("Test Account 1"); - UpdateAccountTest.AddAccount("Test Account 2"); - UpdateAccountTest.AddAccount("Test Account 3"); + updateAccountTest.AddAccount("Test Account 1", 1); + updateAccountTest.AddAccount("Test Account 2", 2); + updateAccountTest.AddAccount("Test Account 3", 3); - int testAccount1ID = UpdateAccountTest.GetAccount("Test Account 1").accountID; - int testAccount2ID = UpdateAccountTest.GetAccount("Test Account 2").accountID; - int testAccount3ID = UpdateAccountTest.GetAccount("Test Account 3").accountID; + int testAccount1ID = updateAccountTest.GetAccount("Test Account 1").accountID; + int testAccount2ID = updateAccountTest.GetAccount("Test Account 2").accountID; + int testAccount3ID = updateAccountTest.GetAccount("Test Account 3").accountID; EXPECT_EQ(1, testAccount1ID); EXPECT_EQ(2, testAccount2ID); EXPECT_EQ(3, testAccount3ID); - ASSERT_EQ(CDSACCOUNT_OK, UpdateAccountTest.UpdateAccount(testAccount1ID, "Test Account 1 - Updated")); - ASSERT_EQ(CDSACCOUNT_OK, UpdateAccountTest.UpdateAccount(testAccount2ID, "Test Account 2 - Updated")); - ASSERT_EQ(CDSACCOUNT_OK, UpdateAccountTest.UpdateAccount(testAccount3ID, "Test Account 3 - Updated")); + ASSERT_EQ(CDSACCOUNT_OK, updateAccountTest.UpdateAccount(testAccount1ID, "Test Account 1 - Updated")); + ASSERT_EQ(CDSACCOUNT_OK, updateAccountTest.UpdateAccount(testAccount2ID, "Test Account 2 - Updated")); + ASSERT_EQ(CDSACCOUNT_OK, updateAccountTest.UpdateAccount(testAccount3ID, "Test Account 3 - Updated")); - ASSERT_NE(CDSACCOUNT_OK, UpdateAccountTest.GetAccount("Test Account 1").accountInfoResult); - ASSERT_EQ(CDSACCOUNT_OK, UpdateAccountTest.GetAccount("Test Account 1 - Updated").accountInfoResult); + ASSERT_NE(CDSACCOUNT_OK, updateAccountTest.GetAccount("Test Account 1").accountInfoResult); + ASSERT_EQ(CDSACCOUNT_OK, updateAccountTest.GetAccount("Test Account 1 - Updated").accountInfoResult); - ASSERT_NE(CDSACCOUNT_OK, UpdateAccountTest.GetAccount("Test Account 2").accountInfoResult); - ASSERT_EQ(CDSACCOUNT_OK, UpdateAccountTest.GetAccount("Test Account 2 - Updated").accountInfoResult); + ASSERT_NE(CDSACCOUNT_OK, updateAccountTest.GetAccount("Test Account 2").accountInfoResult); + ASSERT_EQ(CDSACCOUNT_OK, updateAccountTest.GetAccount("Test Account 2 - Updated").accountInfoResult); - ASSERT_NE(CDSACCOUNT_OK, UpdateAccountTest.GetAccount("Test Account 3").accountInfoResult); - ASSERT_EQ(CDSACCOUNT_OK, UpdateAccountTest.GetAccount("Test Account 3 - Updated").accountInfoResult); + ASSERT_NE(CDSACCOUNT_OK, updateAccountTest.GetAccount("Test Account 3").accountInfoResult); + ASSERT_EQ(CDSACCOUNT_OK, updateAccountTest.GetAccount("Test Account 3 - Updated").accountInfoResult); } TEST(CalendarDataStorage, Delete_One_Account){ - CalendarDataStorage DeleteAccountTest; + CalendarDataStorage deleteAccountTest; - DeleteAccountTest.AddAccount("Test Account 1"); + deleteAccountTest.AddAccount("Test Account 1", 1); - ASSERT_EQ(CDSACCOUNT_OK, DeleteAccountTest.DeleteAccount(DeleteAccountTest.GetAccount("Test Account 1").accountID)); + ASSERT_EQ(CDSACCOUNT_OK, deleteAccountTest.DeleteAccount(deleteAccountTest.GetAccount("Test Account 1").accountID)); } TEST(CalendarDataStorage, Delete_Two_Accounts){ - CalendarDataStorage DeleteAccountTest; + CalendarDataStorage deleteAccountTest; - DeleteAccountTest.AddAccount("Test Account 1"); - DeleteAccountTest.AddAccount("Test Account 2"); + deleteAccountTest.AddAccount("Test Account 1", 1); + deleteAccountTest.AddAccount("Test Account 2", 2); - ASSERT_EQ(CDSACCOUNT_OK, DeleteAccountTest.DeleteAccount(DeleteAccountTest.GetAccount("Test Account 1").accountID)); - ASSERT_EQ(CDSACCOUNT_OK, DeleteAccountTest.DeleteAccount(DeleteAccountTest.GetAccount("Test Account 2").accountID)); + ASSERT_EQ(CDSACCOUNT_OK, deleteAccountTest.DeleteAccount(deleteAccountTest.GetAccount("Test Account 1").accountID)); + ASSERT_EQ(CDSACCOUNT_OK, deleteAccountTest.DeleteAccount(deleteAccountTest.GetAccount("Test Account 2").accountID)); } TEST(CalendarDataStorage, Delete_Three_Accounts){ - CalendarDataStorage DeleteAccountTest; + CalendarDataStorage deleteAccountTest; - DeleteAccountTest.AddAccount("Test Account 1"); - DeleteAccountTest.AddAccount("Test Account 2"); - DeleteAccountTest.AddAccount("Test Account 3"); + deleteAccountTest.AddAccount("Test Account 1", 1); + deleteAccountTest.AddAccount("Test Account 2", 2); + deleteAccountTest.AddAccount("Test Account 3", 3); - ASSERT_EQ(CDSACCOUNT_OK, DeleteAccountTest.DeleteAccount(DeleteAccountTest.GetAccount("Test Account 1").accountID)); - ASSERT_EQ(CDSACCOUNT_OK, DeleteAccountTest.DeleteAccount(DeleteAccountTest.GetAccount("Test Account 2").accountID)); - ASSERT_EQ(CDSACCOUNT_OK, DeleteAccountTest.DeleteAccount(DeleteAccountTest.GetAccount("Test Account 3").accountID)); + ASSERT_EQ(CDSACCOUNT_OK, deleteAccountTest.DeleteAccount(deleteAccountTest.GetAccount("Test Account 1").accountID)); + ASSERT_EQ(CDSACCOUNT_OK, deleteAccountTest.DeleteAccount(deleteAccountTest.GetAccount("Test Account 2").accountID)); + ASSERT_EQ(CDSACCOUNT_OK, deleteAccountTest.DeleteAccount(deleteAccountTest.GetAccount("Test Account 3").accountID)); } TEST(CalendarDataStorage, Add_One_Calendar_To_One_Account){ - CalendarDataStorage AddCalendarTest; + CalendarDataStorage addCalendarTest; - AddCalendarTest.AddAccount("Test Account 1"); + addCalendarTest.AddAccount("Test Account 1", 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, "Calendar Description")); } TEST(CalendarDataStorage, Add_Two_Calendars_To_One_Account){ - CalendarDataStorage AddCalendarTest; + CalendarDataStorage addCalendarTest; - AddCalendarTest.AddAccount("Test Account 1"); + addCalendarTest.AddAccount("Test Account 1", 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, "Calendar Description")); + ASSERT_EQ(CDSCALENDAR_OK, addCalendarTest.AddCalendar(addCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", defaultColour, "Calendar Description")); } TEST(CalendarDataStorage, Add_Three_Calendars_To_One_Account){ - CalendarDataStorage AddCalendarTest; + CalendarDataStorage addCalendarTest; - AddCalendarTest.AddAccount("Test Account 1"); + addCalendarTest.AddAccount("Test Account 1", 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, "Calendar Description")); + ASSERT_EQ(CDSCALENDAR_OK, addCalendarTest.AddCalendar(addCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", defaultColour, "Calendar Description")); + ASSERT_EQ(CDSCALENDAR_OK, addCalendarTest.AddCalendar(addCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", defaultColour, "Calendar Description")); } TEST(CalendarDataStorage, Add_One_Calendar_To_Two_Accounts){ - CalendarDataStorage AddCalendarTest; + CalendarDataStorage addCalendarTest; - AddCalendarTest.AddAccount("Test Account 1"); - AddCalendarTest.AddAccount("Test Account 2"); + addCalendarTest.AddAccount("Test Account 1", 1); + addCalendarTest.AddAccount("Test Account 2", 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, "Calendar Description")); - 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, "Calendar Description")); } TEST(CalendarDataStorage, Add_Two_Calendars_To_Two_Accounts){ - CalendarDataStorage AddCalendarTest; + CalendarDataStorage addCalendarTest; - AddCalendarTest.AddAccount("Test Account 1"); - AddCalendarTest.AddAccount("Test Account 2"); + addCalendarTest.AddAccount("Test Account 1", 1); + addCalendarTest.AddAccount("Test Account 2", 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, "Calendar Description")); + ASSERT_EQ(CDSCALENDAR_OK, addCalendarTest.AddCalendar(addCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", defaultColour, "Calendar Description")); - 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, "Calendar Description")); + ASSERT_EQ(CDSCALENDAR_OK, addCalendarTest.AddCalendar(addCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 2", "calendar2-test", defaultColour, "Calendar Description")); } TEST(CalendarDataStorage, Add_Three_Calendars_To_Two_Accounts){ - CalendarDataStorage AddCalendarTest; + CalendarDataStorage addCalendarTest; - AddCalendarTest.AddAccount("Test Account 1"); - AddCalendarTest.AddAccount("Test Account 2"); + addCalendarTest.AddAccount("Test Account 1", 1); + addCalendarTest.AddAccount("Test Account 2", 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, "Calendar Description")); + ASSERT_EQ(CDSCALENDAR_OK, addCalendarTest.AddCalendar(addCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", defaultColour, "Calendar Description")); + ASSERT_EQ(CDSCALENDAR_OK, addCalendarTest.AddCalendar(addCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", defaultColour, "Calendar Description")); - 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, "Calendar Description")); + ASSERT_EQ(CDSCALENDAR_OK, addCalendarTest.AddCalendar(addCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 2", "calendar2-test", defaultColour, "Calendar Description")); + ASSERT_EQ(CDSCALENDAR_OK, addCalendarTest.AddCalendar(addCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 3", "calendar3-test", defaultColour, "Calendar Description")); } TEST(CalendarDataStorage, Add_One_Calendar_To_Three_Accounts){ - CalendarDataStorage AddCalendarTest; + CalendarDataStorage addCalendarTest; - AddCalendarTest.AddAccount("Test Account 1"); - AddCalendarTest.AddAccount("Test Account 2"); - AddCalendarTest.AddAccount("Test Account 3"); + addCalendarTest.AddAccount("Test Account 1", 1); + addCalendarTest.AddAccount("Test Account 2", 2); + addCalendarTest.AddAccount("Test Account 3", 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, "Calendar Description")); - 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, "Calendar Description")); - 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, "Calendar Description")); } TEST(CalendarDataStorage, Add_Two_Calendars_To_Three_Accounts){ - CalendarDataStorage AddCalendarTest; + CalendarDataStorage addCalendarTest; - AddCalendarTest.AddAccount("Test Account 1"); - AddCalendarTest.AddAccount("Test Account 2"); - AddCalendarTest.AddAccount("Test Account 3"); + addCalendarTest.AddAccount("Test Account 1", 1); + addCalendarTest.AddAccount("Test Account 2", 2); + addCalendarTest.AddAccount("Test Account 3", 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, "Calendar Description")); + ASSERT_EQ(CDSCALENDAR_OK, addCalendarTest.AddCalendar(addCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", defaultColour, "Calendar Description")); - 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, "Calendar Description")); + ASSERT_EQ(CDSCALENDAR_OK, addCalendarTest.AddCalendar(addCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 2", "calendar2-test", defaultColour, "Calendar Description")); - 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, "Calendar Description")); + ASSERT_EQ(CDSCALENDAR_OK, addCalendarTest.AddCalendar(addCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 2", "calendar2-test", defaultColour, "Calendar Description")); } TEST(CalendarDataStorage, Add_Three_Calendars_To_Three_Accounts){ - CalendarDataStorage AddCalendarTest; + CalendarDataStorage addCalendarTest; - AddCalendarTest.AddAccount("Test Account 1"); - AddCalendarTest.AddAccount("Test Account 2"); - AddCalendarTest.AddAccount("Test Account 3"); + addCalendarTest.AddAccount("Test Account 1", 1); + addCalendarTest.AddAccount("Test Account 2", 2); + addCalendarTest.AddAccount("Test Account 3", 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, "Calendar Description")); + ASSERT_EQ(CDSCALENDAR_OK, addCalendarTest.AddCalendar(addCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", defaultColour, "Calendar Description")); + ASSERT_EQ(CDSCALENDAR_OK, addCalendarTest.AddCalendar(addCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", defaultColour, "Calendar Description")); - 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, "Calendar Description")); + ASSERT_EQ(CDSCALENDAR_OK, addCalendarTest.AddCalendar(addCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 2", "calendar2-test", defaultColour, "Calendar Description")); + ASSERT_EQ(CDSCALENDAR_OK, addCalendarTest.AddCalendar(addCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 3", "calendar3-test", defaultColour, "Calendar Description")); - 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, "Calendar Description")); + ASSERT_EQ(CDSCALENDAR_OK, addCalendarTest.AddCalendar(addCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 2", "calendar2-test", defaultColour, "Calendar Description")); + ASSERT_EQ(CDSCALENDAR_OK, addCalendarTest.AddCalendar(addCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 3", "calendar3-test", defaultColour, "Calendar Description")); } TEST(CalendarDataStorage, Get_Calendar_Information_From_One_Account){ - CalendarDataStorage GetCalendarTest; + CalendarDataStorage getCalendarTest; - GetCalendarTest.AddAccount("Test Account 1"); + getCalendarTest.AddAccount("Test Account 1", 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, "Calendar Description 1")); + ASSERT_EQ(CDSCALENDAR_OK, getCalendarTest.AddCalendar(getCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", defaultColour, "Calendar Description 2")); + ASSERT_EQ(CDSCALENDAR_OK, getCalendarTest.AddCalendar(getCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", defaultColour, "Calendar Description 3")); CDSGetCalendarInfo calendar1Info; CDSGetCalendarInfo calendar2Info; CDSGetCalendarInfo calendar3Info; - calendar1Info = GetCalendarTest.GetCalendar("Test Account 1", "calendar1-test"); - calendar2Info = GetCalendarTest.GetCalendar("Test Account 1", "calendar2-test"); - calendar3Info = GetCalendarTest.GetCalendar("Test Account 1", "calendar3-test"); + calendar1Info = getCalendarTest.GetCalendar("Test Account 1", "calendar1-test"); + calendar2Info = getCalendarTest.GetCalendar("Test Account 1", "calendar2-test"); + calendar3Info = getCalendarTest.GetCalendar("Test Account 1", "calendar3-test"); ASSERT_EQ(CDSCALENDAR_OK, calendar1Info.calendarInfoResult); ASSERT_EQ(CDSCALENDAR_OK, calendar2Info.calendarInfoResult); @@ -387,25 +466,29 @@ TEST(CalendarDataStorage, Get_Calendar_Information_From_One_Account){ ASSERT_EQ("calendar3-test", calendar3Info.calendarTextID); ASSERT_EQ("Test Account 1", calendar1Info.accountName); - ASSERT_EQ("Test Account 1", calendar1Info.accountName); - ASSERT_EQ("Test Account 1", calendar1Info.accountName); + ASSERT_EQ("Test Account 1", calendar2Info.accountName); + ASSERT_EQ("Test Account 1", calendar3Info.accountName); + + ASSERT_EQ("Calendar Description 1", calendar1Info.calendarDescription); + ASSERT_EQ("Calendar Description 2", calendar2Info.calendarDescription); + ASSERT_EQ("Calendar Description 3", calendar3Info.calendarDescription); } TEST(CalendarDataStorage, Get_Calendar_Information_From_Two_Accounts){ - CalendarDataStorage GetCalendarTest; + CalendarDataStorage getCalendarTest; - GetCalendarTest.AddAccount("Test Account 1"); - GetCalendarTest.AddAccount("Test Account 2"); + getCalendarTest.AddAccount("Test Account 1", 1); + getCalendarTest.AddAccount("Test Account 2", 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, "Calendar Description 1")); + ASSERT_EQ(CDSCALENDAR_OK, getCalendarTest.AddCalendar(getCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", defaultColour, "Calendar Description 2")); + ASSERT_EQ(CDSCALENDAR_OK, getCalendarTest.AddCalendar(getCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", defaultColour, "Calendar Description 3")); - 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, "Calendar Description 4")); + ASSERT_EQ(CDSCALENDAR_OK, getCalendarTest.AddCalendar(getCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 2", "calendar2-test", defaultColour, "Calendar Description 5")); + ASSERT_EQ(CDSCALENDAR_OK, getCalendarTest.AddCalendar(getCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 3", "calendar3-test", defaultColour, "Calendar Description 6")); CDSGetCalendarInfo calendar1Info; CDSGetCalendarInfo calendar2Info; @@ -415,13 +498,13 @@ TEST(CalendarDataStorage, Get_Calendar_Information_From_Two_Accounts){ CDSGetCalendarInfo calendar5Info; CDSGetCalendarInfo calendar6Info; - calendar1Info = GetCalendarTest.GetCalendar("Test Account 1", "calendar1-test"); - calendar2Info = GetCalendarTest.GetCalendar("Test Account 1", "calendar2-test"); - calendar3Info = GetCalendarTest.GetCalendar("Test Account 1", "calendar3-test"); + calendar1Info = getCalendarTest.GetCalendar("Test Account 1", "calendar1-test"); + calendar2Info = getCalendarTest.GetCalendar("Test Account 1", "calendar2-test"); + calendar3Info = getCalendarTest.GetCalendar("Test Account 1", "calendar3-test"); - calendar4Info = GetCalendarTest.GetCalendar("Test Account 2", "calendar1-test"); - calendar5Info = GetCalendarTest.GetCalendar("Test Account 2", "calendar2-test"); - calendar6Info = GetCalendarTest.GetCalendar("Test Account 2", "calendar3-test"); + calendar4Info = getCalendarTest.GetCalendar("Test Account 2", "calendar1-test"); + calendar5Info = getCalendarTest.GetCalendar("Test Account 2", "calendar2-test"); + calendar6Info = getCalendarTest.GetCalendar("Test Account 2", "calendar3-test"); ASSERT_EQ(CDSCALENDAR_OK, calendar1Info.calendarInfoResult); ASSERT_EQ(CDSCALENDAR_OK, calendar2Info.calendarInfoResult); @@ -479,27 +562,34 @@ TEST(CalendarDataStorage, Get_Calendar_Information_From_Two_Accounts){ ASSERT_EQ("Test Account 2", calendar5Info.accountName); ASSERT_EQ("Test Account 2", calendar6Info.accountName); + ASSERT_EQ("Calendar Description 1", calendar1Info.calendarDescription); + ASSERT_EQ("Calendar Description 2", calendar2Info.calendarDescription); + ASSERT_EQ("Calendar Description 3", calendar3Info.calendarDescription); + ASSERT_EQ("Calendar Description 4", calendar4Info.calendarDescription); + ASSERT_EQ("Calendar Description 5", calendar5Info.calendarDescription); + ASSERT_EQ("Calendar Description 6", calendar6Info.calendarDescription); + } TEST(CalendarDataStorage, Get_Calendar_Information_From_Three_Accounts){ - CalendarDataStorage GetCalendarTest; + CalendarDataStorage getCalendarTest; - GetCalendarTest.AddAccount("Test Account 1"); - GetCalendarTest.AddAccount("Test Account 2"); - GetCalendarTest.AddAccount("Test Account 3"); + getCalendarTest.AddAccount("Test Account 1", 1); + getCalendarTest.AddAccount("Test Account 2", 2); + getCalendarTest.AddAccount("Test Account 3", 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, "Calendar Description 1")); + ASSERT_EQ(CDSCALENDAR_OK, getCalendarTest.AddCalendar(getCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", defaultColour, "Calendar Description 2")); + ASSERT_EQ(CDSCALENDAR_OK, getCalendarTest.AddCalendar(getCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", defaultColour, "Calendar Description 3")); - 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, "Calendar Description 4")); + ASSERT_EQ(CDSCALENDAR_OK, getCalendarTest.AddCalendar(getCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 2", "calendar2-test", defaultColour, "Calendar Description 5")); + ASSERT_EQ(CDSCALENDAR_OK, getCalendarTest.AddCalendar(getCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 3", "calendar3-test", defaultColour, "Calendar Description 6")); - 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, "Calendar Description 7")); + ASSERT_EQ(CDSCALENDAR_OK, getCalendarTest.AddCalendar(getCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 2", "calendar2-test", defaultColour, "Calendar Description 8")); + ASSERT_EQ(CDSCALENDAR_OK, getCalendarTest.AddCalendar(getCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 3", "calendar3-test", defaultColour, "Calendar Description 9")); CDSGetCalendarInfo calendar1Info; CDSGetCalendarInfo calendar2Info; @@ -513,17 +603,17 @@ TEST(CalendarDataStorage, Get_Calendar_Information_From_Three_Accounts){ CDSGetCalendarInfo calendar8Info; CDSGetCalendarInfo calendar9Info; - calendar1Info = GetCalendarTest.GetCalendar("Test Account 1", "calendar1-test"); - calendar2Info = GetCalendarTest.GetCalendar("Test Account 1", "calendar2-test"); - calendar3Info = GetCalendarTest.GetCalendar("Test Account 1", "calendar3-test"); + calendar1Info = getCalendarTest.GetCalendar("Test Account 1", "calendar1-test"); + calendar2Info = getCalendarTest.GetCalendar("Test Account 1", "calendar2-test"); + calendar3Info = getCalendarTest.GetCalendar("Test Account 1", "calendar3-test"); - calendar4Info = GetCalendarTest.GetCalendar("Test Account 2", "calendar1-test"); - calendar5Info = GetCalendarTest.GetCalendar("Test Account 2", "calendar2-test"); - calendar6Info = GetCalendarTest.GetCalendar("Test Account 2", "calendar3-test"); + calendar4Info = getCalendarTest.GetCalendar("Test Account 2", "calendar1-test"); + calendar5Info = getCalendarTest.GetCalendar("Test Account 2", "calendar2-test"); + calendar6Info = getCalendarTest.GetCalendar("Test Account 2", "calendar3-test"); - calendar7Info = GetCalendarTest.GetCalendar("Test Account 3", "calendar1-test"); - calendar8Info = GetCalendarTest.GetCalendar("Test Account 3", "calendar2-test"); - calendar9Info = GetCalendarTest.GetCalendar("Test Account 3", "calendar3-test"); + calendar7Info = getCalendarTest.GetCalendar("Test Account 3", "calendar1-test"); + calendar8Info = getCalendarTest.GetCalendar("Test Account 3", "calendar2-test"); + calendar9Info = getCalendarTest.GetCalendar("Test Account 3", "calendar3-test"); ASSERT_EQ(CDSCALENDAR_OK, calendar1Info.calendarInfoResult); ASSERT_EQ(CDSCALENDAR_OK, calendar2Info.calendarInfoResult); @@ -609,337 +699,393 @@ TEST(CalendarDataStorage, Get_Calendar_Information_From_Three_Accounts){ ASSERT_EQ("Test Account 3", calendar8Info.accountName); ASSERT_EQ("Test Account 3", calendar9Info.accountName); + ASSERT_EQ("Calendar Description 1", calendar1Info.calendarDescription); + ASSERT_EQ("Calendar Description 2", calendar2Info.calendarDescription); + ASSERT_EQ("Calendar Description 3", calendar3Info.calendarDescription); + + ASSERT_EQ("Calendar Description 4", calendar4Info.calendarDescription); + ASSERT_EQ("Calendar Description 5", calendar5Info.calendarDescription); + ASSERT_EQ("Calendar Description 6", calendar6Info.calendarDescription); + + ASSERT_EQ("Calendar Description 7", calendar7Info.calendarDescription); + ASSERT_EQ("Calendar Description 8", calendar8Info.calendarDescription); + ASSERT_EQ("Calendar Description 9", calendar9Info.calendarDescription); + } TEST(CalendarDataStorage, Update_One_Calendar_With_One_Account){ - CalendarDataStorage UpdateCalendarTest; + CalendarDataStorage updateCalendarTest; - UpdateCalendarTest.AddAccount("Test Account 1"); + updateCalendarTest.AddAccount("Test Account 1", 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, "Calendar Description 1")); - CDSGetCalendarInfo calendar1Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test"); + CDSGetCalendarInfo calendar1Info = updateCalendarTest.GetCalendar("Test Account 1", "calendar1-test"); - ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar1Info.calendarID, "Calendar 1 Updated")); - ASSERT_EQ("Calendar 1 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarName); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.UpdateCalendar(calendar1Info.calendarID, "Calendar 1 Updated", defaultColour, "Calendar Description 1 Updated")); + ASSERT_EQ("Calendar 1 Updated", updateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarName); + ASSERT_EQ("Calendar Description 1 Updated", updateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarDescription); } TEST(CalendarDataStorage, Update_One_Calendar_With_Two_Accounts){ - CalendarDataStorage UpdateCalendarTest; + CalendarDataStorage updateCalendarTest; - UpdateCalendarTest.AddAccount("Test Account 1"); - UpdateCalendarTest.AddAccount("Test Account 2"); + updateCalendarTest.AddAccount("Test Account 1", 1); + updateCalendarTest.AddAccount("Test Account 2", 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, "Calendar Description 1")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.AddCalendar(updateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test", defaultColour, "Calendar Description 2")); - CDSGetCalendarInfo calendar1Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test"); - CDSGetCalendarInfo calendar2Info = UpdateCalendarTest.GetCalendar("Test Account 2", "calendar1-test"); + CDSGetCalendarInfo calendar1Info = updateCalendarTest.GetCalendar("Test Account 1", "calendar1-test"); + CDSGetCalendarInfo calendar2Info = updateCalendarTest.GetCalendar("Test Account 2", "calendar1-test"); - ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar1Info.calendarID, "Calendar 1 Updated")); - ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar2Info.calendarID, "Calendar 1 Updated")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.UpdateCalendar(calendar1Info.calendarID, "Calendar 1 Updated", defaultColour, "Calendar Description 1 Updated")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.UpdateCalendar(calendar2Info.calendarID, "Calendar 1 Updated", defaultColour, "Calendar Description 2 Updated")); - ASSERT_EQ("Calendar 1 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarName); - ASSERT_EQ("Calendar 1 Updated", UpdateCalendarTest.GetCalendar("Test Account 2", "calendar1-test").calendarName); + ASSERT_EQ("Calendar 1 Updated", updateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarName); + ASSERT_EQ("Calendar 1 Updated", updateCalendarTest.GetCalendar("Test Account 2", "calendar1-test").calendarName); + + ASSERT_EQ("Calendar Description 1 Updated", updateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarDescription); + ASSERT_EQ("Calendar Description 2 Updated", updateCalendarTest.GetCalendar("Test Account 2", "calendar1-test").calendarDescription); } TEST(CalendarDataStorage, Update_One_Calendar_With_Three_Accounts){ - CalendarDataStorage UpdateCalendarTest; + CalendarDataStorage updateCalendarTest; - UpdateCalendarTest.AddAccount("Test Account 1"); - UpdateCalendarTest.AddAccount("Test Account 2"); - UpdateCalendarTest.AddAccount("Test Account 3"); + updateCalendarTest.AddAccount("Test Account 1", 1); + updateCalendarTest.AddAccount("Test Account 2", 2); + updateCalendarTest.AddAccount("Test Account 3", 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, "Calendar Description 1")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.AddCalendar(updateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test", defaultColour, "Calendar Description 2")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.AddCalendar(updateCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 1", "calendar1-test", defaultColour, "Calendar Description 3")); - CDSGetCalendarInfo calendar1Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test"); - CDSGetCalendarInfo calendar2Info = UpdateCalendarTest.GetCalendar("Test Account 2", "calendar1-test"); - CDSGetCalendarInfo calendar3Info = UpdateCalendarTest.GetCalendar("Test Account 3", "calendar1-test"); + CDSGetCalendarInfo calendar1Info = updateCalendarTest.GetCalendar("Test Account 1", "calendar1-test"); + CDSGetCalendarInfo calendar2Info = updateCalendarTest.GetCalendar("Test Account 2", "calendar1-test"); + CDSGetCalendarInfo calendar3Info = updateCalendarTest.GetCalendar("Test Account 3", "calendar1-test"); - ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar1Info.calendarID, "Calendar 1 Updated")); - ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar2Info.calendarID, "Calendar 1 Updated")); - ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar3Info.calendarID, "Calendar 1 Updated")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.UpdateCalendar(calendar1Info.calendarID, "Calendar 1 Updated", defaultColour, "Calendar Description 1 Updated")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.UpdateCalendar(calendar2Info.calendarID, "Calendar 1 Updated", defaultColour, "Calendar Description 2 Updated")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.UpdateCalendar(calendar3Info.calendarID, "Calendar 1 Updated", defaultColour, "Calendar Description 3 Updated")); - ASSERT_EQ("Calendar 1 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarName); - ASSERT_EQ("Calendar 1 Updated", UpdateCalendarTest.GetCalendar("Test Account 2", "calendar1-test").calendarName); - ASSERT_EQ("Calendar 1 Updated", UpdateCalendarTest.GetCalendar("Test Account 3", "calendar1-test").calendarName); + ASSERT_EQ("Calendar 1 Updated", updateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarName); + ASSERT_EQ("Calendar 1 Updated", updateCalendarTest.GetCalendar("Test Account 2", "calendar1-test").calendarName); + ASSERT_EQ("Calendar 1 Updated", updateCalendarTest.GetCalendar("Test Account 3", "calendar1-test").calendarName); + + ASSERT_EQ("Calendar Description 1 Updated", updateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarDescription); + ASSERT_EQ("Calendar Description 2 Updated", updateCalendarTest.GetCalendar("Test Account 2", "calendar1-test").calendarDescription); + ASSERT_EQ("Calendar Description 3 Updated", updateCalendarTest.GetCalendar("Test Account 3", "calendar1-test").calendarDescription); } TEST(CalendarDataStorage, Update_Two_Calendars_With_One_Account){ - CalendarDataStorage UpdateCalendarTest; + CalendarDataStorage updateCalendarTest; - UpdateCalendarTest.AddAccount("Test Account 1"); + updateCalendarTest.AddAccount("Test Account 1", 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, "Calendar Description 1")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.AddCalendar(updateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", defaultColour, "Calendar Description 2")); - CDSGetCalendarInfo calendar1Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test"); - CDSGetCalendarInfo calendar2Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar2-test"); + CDSGetCalendarInfo calendar1Info = updateCalendarTest.GetCalendar("Test Account 1", "calendar1-test"); + CDSGetCalendarInfo calendar2Info = updateCalendarTest.GetCalendar("Test Account 1", "calendar2-test"); - ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar1Info.calendarID, "Calendar 1 Updated")); - ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar2Info.calendarID, "Calendar 2 Updated")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.UpdateCalendar(calendar1Info.calendarID, "Calendar 1 Updated", defaultColour, "Calendar Description 1 Updated")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.UpdateCalendar(calendar2Info.calendarID, "Calendar 2 Updated", defaultColour, "Calendar Description 2 Updated")); - ASSERT_EQ("Calendar 1 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarName); - ASSERT_EQ("Calendar 2 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar2-test").calendarName); + ASSERT_EQ("Calendar 1 Updated", updateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarName); + ASSERT_EQ("Calendar 2 Updated", updateCalendarTest.GetCalendar("Test Account 1", "calendar2-test").calendarName); + + ASSERT_EQ("Calendar Description 1 Updated", updateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarDescription); + ASSERT_EQ("Calendar Description 2 Updated", updateCalendarTest.GetCalendar("Test Account 1", "calendar2-test").calendarDescription); } TEST(CalendarDataStorage, Update_Two_Calendars_With_Two_Accounts){ - CalendarDataStorage UpdateCalendarTest; + CalendarDataStorage updateCalendarTest; - UpdateCalendarTest.AddAccount("Test Account 1"); - UpdateCalendarTest.AddAccount("Test Account 2"); + updateCalendarTest.AddAccount("Test Account 1", 1); + updateCalendarTest.AddAccount("Test Account 2", 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, "Calendar Description 1")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.AddCalendar(updateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", defaultColour, "Calendar Description 2")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.AddCalendar(updateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 3", "calendar1-test", defaultColour, "Calendar Description 3")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.AddCalendar(updateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 4", "calendar2-test", defaultColour, "Calendar Description 4")); - CDSGetCalendarInfo calendar1Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test"); - CDSGetCalendarInfo calendar2Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar2-test"); - CDSGetCalendarInfo calendar3Info = UpdateCalendarTest.GetCalendar("Test Account 2", "calendar1-test"); - CDSGetCalendarInfo calendar4Info = UpdateCalendarTest.GetCalendar("Test Account 2", "calendar2-test"); + CDSGetCalendarInfo calendar1Info = updateCalendarTest.GetCalendar("Test Account 1", "calendar1-test"); + CDSGetCalendarInfo calendar2Info = updateCalendarTest.GetCalendar("Test Account 1", "calendar2-test"); + CDSGetCalendarInfo calendar3Info = updateCalendarTest.GetCalendar("Test Account 2", "calendar1-test"); + CDSGetCalendarInfo calendar4Info = updateCalendarTest.GetCalendar("Test Account 2", "calendar2-test"); - ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar1Info.calendarID, "Calendar 1 Updated")); - ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar2Info.calendarID, "Calendar 2 Updated")); - ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar3Info.calendarID, "Calendar 3 Updated")); - ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar4Info.calendarID, "Calendar 4 Updated")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.UpdateCalendar(calendar1Info.calendarID, "Calendar 1 Updated", defaultColour, "Calendar Description 1 Updated")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.UpdateCalendar(calendar2Info.calendarID, "Calendar 2 Updated", defaultColour, "Calendar Description 2 Updated")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.UpdateCalendar(calendar3Info.calendarID, "Calendar 3 Updated", defaultColour, "Calendar Description 3 Updated")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.UpdateCalendar(calendar4Info.calendarID, "Calendar 4 Updated", defaultColour, "Calendar Description 4 Updated")); - ASSERT_EQ("Calendar 1 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarName); - ASSERT_EQ("Calendar 2 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar2-test").calendarName); - ASSERT_EQ("Calendar 3 Updated", UpdateCalendarTest.GetCalendar("Test Account 2", "calendar1-test").calendarName); - ASSERT_EQ("Calendar 4 Updated", UpdateCalendarTest.GetCalendar("Test Account 2", "calendar2-test").calendarName); + ASSERT_EQ("Calendar 1 Updated", updateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarName); + ASSERT_EQ("Calendar 2 Updated", updateCalendarTest.GetCalendar("Test Account 1", "calendar2-test").calendarName); + ASSERT_EQ("Calendar 3 Updated", updateCalendarTest.GetCalendar("Test Account 2", "calendar1-test").calendarName); + ASSERT_EQ("Calendar 4 Updated", updateCalendarTest.GetCalendar("Test Account 2", "calendar2-test").calendarName); + + ASSERT_EQ("Calendar Description 1 Updated", updateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarDescription); + ASSERT_EQ("Calendar Description 2 Updated", updateCalendarTest.GetCalendar("Test Account 1", "calendar2-test").calendarDescription); + ASSERT_EQ("Calendar Description 3 Updated", updateCalendarTest.GetCalendar("Test Account 2", "calendar1-test").calendarDescription); + ASSERT_EQ("Calendar Description 4 Updated", updateCalendarTest.GetCalendar("Test Account 2", "calendar2-test").calendarDescription); } TEST(CalendarDataStorage, Update_Two_Calendars_With_Three_Accounts){ - CalendarDataStorage UpdateCalendarTest; - - UpdateCalendarTest.AddAccount("Test Account 1"); - 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")); - - CDSGetCalendarInfo calendar1Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test"); - CDSGetCalendarInfo calendar2Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar2-test"); - CDSGetCalendarInfo calendar3Info = UpdateCalendarTest.GetCalendar("Test Account 2", "calendar1-test"); - CDSGetCalendarInfo calendar4Info = UpdateCalendarTest.GetCalendar("Test Account 2", "calendar2-test"); - CDSGetCalendarInfo calendar5Info = UpdateCalendarTest.GetCalendar("Test Account 3", "calendar1-test"); - CDSGetCalendarInfo calendar6Info = UpdateCalendarTest.GetCalendar("Test Account 3", "calendar2-test"); - - ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar1Info.calendarID, "Calendar 1 Updated")); - ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar2Info.calendarID, "Calendar 2 Updated")); - ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar3Info.calendarID, "Calendar 3 Updated")); - ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar4Info.calendarID, "Calendar 4 Updated")); - ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar5Info.calendarID, "Calendar 5 Updated")); - ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar6Info.calendarID, "Calendar 6 Updated")); - - ASSERT_EQ("Calendar 1 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarName); - ASSERT_EQ("Calendar 2 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar2-test").calendarName); - ASSERT_EQ("Calendar 3 Updated", UpdateCalendarTest.GetCalendar("Test Account 2", "calendar1-test").calendarName); - ASSERT_EQ("Calendar 4 Updated", UpdateCalendarTest.GetCalendar("Test Account 2", "calendar2-test").calendarName); - ASSERT_EQ("Calendar 5 Updated", UpdateCalendarTest.GetCalendar("Test Account 3", "calendar1-test").calendarName); - ASSERT_EQ("Calendar 6 Updated", UpdateCalendarTest.GetCalendar("Test Account 3", "calendar2-test").calendarName); + CalendarDataStorage updateCalendarTest; + + updateCalendarTest.AddAccount("Test Account 1", 1); + updateCalendarTest.AddAccount("Test Account 2", 2); + updateCalendarTest.AddAccount("Test Account 3", 3); + + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.AddCalendar(updateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", defaultColour, "Calendar Description 1")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.AddCalendar(updateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", defaultColour, "Calendar Description 2")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.AddCalendar(updateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 3", "calendar1-test", defaultColour, "Calendar Description 3")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.AddCalendar(updateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 4", "calendar2-test", defaultColour, "Calendar Description 4")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.AddCalendar(updateCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 5", "calendar1-test", defaultColour, "Calendar Description 5")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.AddCalendar(updateCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 6", "calendar2-test", defaultColour, "Calendar Description 6")); + + CDSGetCalendarInfo calendar1Info = updateCalendarTest.GetCalendar("Test Account 1", "calendar1-test"); + CDSGetCalendarInfo calendar2Info = updateCalendarTest.GetCalendar("Test Account 1", "calendar2-test"); + CDSGetCalendarInfo calendar3Info = updateCalendarTest.GetCalendar("Test Account 2", "calendar1-test"); + CDSGetCalendarInfo calendar4Info = updateCalendarTest.GetCalendar("Test Account 2", "calendar2-test"); + CDSGetCalendarInfo calendar5Info = updateCalendarTest.GetCalendar("Test Account 3", "calendar1-test"); + CDSGetCalendarInfo calendar6Info = updateCalendarTest.GetCalendar("Test Account 3", "calendar2-test"); + + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.UpdateCalendar(calendar1Info.calendarID, "Calendar 1 Updated", defaultColour, "Calendar Description 1 Updated")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.UpdateCalendar(calendar2Info.calendarID, "Calendar 2 Updated", defaultColour, "Calendar Description 2 Updated")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.UpdateCalendar(calendar3Info.calendarID, "Calendar 3 Updated", defaultColour, "Calendar Description 3 Updated")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.UpdateCalendar(calendar4Info.calendarID, "Calendar 4 Updated", defaultColour, "Calendar Description 4 Updated")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.UpdateCalendar(calendar5Info.calendarID, "Calendar 5 Updated", defaultColour, "Calendar Description 5 Updated")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.UpdateCalendar(calendar6Info.calendarID, "Calendar 6 Updated", defaultColour, "Calendar Description 6 Updated")); + + ASSERT_EQ("Calendar 1 Updated", updateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarName); + ASSERT_EQ("Calendar 2 Updated", updateCalendarTest.GetCalendar("Test Account 1", "calendar2-test").calendarName); + ASSERT_EQ("Calendar 3 Updated", updateCalendarTest.GetCalendar("Test Account 2", "calendar1-test").calendarName); + ASSERT_EQ("Calendar 4 Updated", updateCalendarTest.GetCalendar("Test Account 2", "calendar2-test").calendarName); + ASSERT_EQ("Calendar 5 Updated", updateCalendarTest.GetCalendar("Test Account 3", "calendar1-test").calendarName); + ASSERT_EQ("Calendar 6 Updated", updateCalendarTest.GetCalendar("Test Account 3", "calendar2-test").calendarName); + + ASSERT_EQ("Calendar Description 1 Updated", updateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarDescription); + ASSERT_EQ("Calendar Description 2 Updated", updateCalendarTest.GetCalendar("Test Account 1", "calendar2-test").calendarDescription); + ASSERT_EQ("Calendar Description 3 Updated", updateCalendarTest.GetCalendar("Test Account 2", "calendar1-test").calendarDescription); + ASSERT_EQ("Calendar Description 4 Updated", updateCalendarTest.GetCalendar("Test Account 2", "calendar2-test").calendarDescription); + ASSERT_EQ("Calendar Description 5 Updated", updateCalendarTest.GetCalendar("Test Account 3", "calendar1-test").calendarDescription); + ASSERT_EQ("Calendar Description 6 Updated", updateCalendarTest.GetCalendar("Test Account 3", "calendar2-test").calendarDescription); } TEST(CalendarDataStorage, Update_Three_Calendars_With_One_Account){ - CalendarDataStorage UpdateCalendarTest; + CalendarDataStorage updateCalendarTest; - UpdateCalendarTest.AddAccount("Test Account 1"); + updateCalendarTest.AddAccount("Test Account 1", 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")); - - CDSGetCalendarInfo calendar1Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test"); - CDSGetCalendarInfo calendar2Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar2-test"); - CDSGetCalendarInfo calendar3Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar3-test"); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.AddCalendar(updateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", defaultColour, "Calendar Description 1")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.AddCalendar(updateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", defaultColour, "Calendar Description 2")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.AddCalendar(updateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", defaultColour, "Calendar Description 3")); - ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar1Info.calendarID, "Calendar 1 Updated")); - ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar2Info.calendarID, "Calendar 2 Updated")); - ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar3Info.calendarID, "Calendar 3 Updated")); + CDSGetCalendarInfo calendar1Info = updateCalendarTest.GetCalendar("Test Account 1", "calendar1-test"); + CDSGetCalendarInfo calendar2Info = updateCalendarTest.GetCalendar("Test Account 1", "calendar2-test"); + CDSGetCalendarInfo calendar3Info = updateCalendarTest.GetCalendar("Test Account 1", "calendar3-test"); - ASSERT_EQ("Calendar 1 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarName); - ASSERT_EQ("Calendar 2 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar2-test").calendarName); - ASSERT_EQ("Calendar 3 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar3-test").calendarName); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.UpdateCalendar(calendar1Info.calendarID, "Calendar 1 Updated", defaultColour, "Calendar Description 1 Updated")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.UpdateCalendar(calendar2Info.calendarID, "Calendar 2 Updated", defaultColour, "Calendar Description 2 Updated")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.UpdateCalendar(calendar3Info.calendarID, "Calendar 3 Updated", defaultColour, "Calendar Description 3 Updated")); + ASSERT_EQ("Calendar 1 Updated", updateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarName); + ASSERT_EQ("Calendar 2 Updated", updateCalendarTest.GetCalendar("Test Account 1", "calendar2-test").calendarName); + ASSERT_EQ("Calendar 3 Updated", updateCalendarTest.GetCalendar("Test Account 1", "calendar3-test").calendarName); + + ASSERT_EQ("Calendar Description 1 Updated", updateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarDescription); + ASSERT_EQ("Calendar Description 2 Updated", updateCalendarTest.GetCalendar("Test Account 1", "calendar2-test").calendarDescription); + ASSERT_EQ("Calendar Description 3 Updated", updateCalendarTest.GetCalendar("Test Account 1", "calendar3-test").calendarDescription); + } TEST(CalendarDataStorage, Update_Three_Calendars_With_Two_Accounts){ - CalendarDataStorage UpdateCalendarTest; - - 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")); - - CDSGetCalendarInfo calendar1Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test"); - CDSGetCalendarInfo calendar2Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar2-test"); - CDSGetCalendarInfo calendar3Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar3-test"); - CDSGetCalendarInfo calendar4Info = UpdateCalendarTest.GetCalendar("Test Account 2", "calendar1-test"); - CDSGetCalendarInfo calendar5Info = UpdateCalendarTest.GetCalendar("Test Account 2", "calendar2-test"); - CDSGetCalendarInfo calendar6Info = UpdateCalendarTest.GetCalendar("Test Account 2", "calendar3-test"); - - ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar1Info.calendarID, "Calendar 1 Updated")); - ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar2Info.calendarID, "Calendar 2 Updated")); - ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar3Info.calendarID, "Calendar 3 Updated")); - ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar4Info.calendarID, "Calendar 4 Updated")); - ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar5Info.calendarID, "Calendar 5 Updated")); - ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar6Info.calendarID, "Calendar 6 Updated")); - - ASSERT_EQ("Calendar 1 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarName); - ASSERT_EQ("Calendar 2 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar2-test").calendarName); - ASSERT_EQ("Calendar 3 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar3-test").calendarName); - ASSERT_EQ("Calendar 4 Updated", UpdateCalendarTest.GetCalendar("Test Account 2", "calendar1-test").calendarName); - ASSERT_EQ("Calendar 5 Updated", UpdateCalendarTest.GetCalendar("Test Account 2", "calendar2-test").calendarName); - ASSERT_EQ("Calendar 6 Updated", UpdateCalendarTest.GetCalendar("Test Account 2", "calendar3-test").calendarName); + CalendarDataStorage updateCalendarTest; + + updateCalendarTest.AddAccount("Test Account 1", 1); + updateCalendarTest.AddAccount("Test Account 2", 2); + + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.AddCalendar(updateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", defaultColour, "Calendar Description 1")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.AddCalendar(updateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", defaultColour, "Calendar Description 2")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.AddCalendar(updateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", defaultColour, "Calendar Description 3")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.AddCalendar(updateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 4", "calendar1-test", defaultColour, "Calendar Description 4")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.AddCalendar(updateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 5", "calendar2-test", defaultColour, "Calendar Description 5")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.AddCalendar(updateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 6", "calendar3-test", defaultColour, "Calendar Description 6")); + + CDSGetCalendarInfo calendar1Info = updateCalendarTest.GetCalendar("Test Account 1", "calendar1-test"); + CDSGetCalendarInfo calendar2Info = updateCalendarTest.GetCalendar("Test Account 1", "calendar2-test"); + CDSGetCalendarInfo calendar3Info = updateCalendarTest.GetCalendar("Test Account 1", "calendar3-test"); + CDSGetCalendarInfo calendar4Info = updateCalendarTest.GetCalendar("Test Account 2", "calendar1-test"); + CDSGetCalendarInfo calendar5Info = updateCalendarTest.GetCalendar("Test Account 2", "calendar2-test"); + CDSGetCalendarInfo calendar6Info = updateCalendarTest.GetCalendar("Test Account 2", "calendar3-test"); + + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.UpdateCalendar(calendar1Info.calendarID, "Calendar 1 Updated", defaultColour, "Calendar Description 1 Updated")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.UpdateCalendar(calendar2Info.calendarID, "Calendar 2 Updated", defaultColour, "Calendar Description 2 Updated")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.UpdateCalendar(calendar3Info.calendarID, "Calendar 3 Updated", defaultColour, "Calendar Description 3 Updated")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.UpdateCalendar(calendar4Info.calendarID, "Calendar 4 Updated", defaultColour, "Calendar Description 4 Updated")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.UpdateCalendar(calendar5Info.calendarID, "Calendar 5 Updated", defaultColour, "Calendar Description 5 Updated")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.UpdateCalendar(calendar6Info.calendarID, "Calendar 6 Updated", defaultColour, "Calendar Description 6 Updated")); + + ASSERT_EQ("Calendar 1 Updated", updateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarName); + ASSERT_EQ("Calendar 2 Updated", updateCalendarTest.GetCalendar("Test Account 1", "calendar2-test").calendarName); + ASSERT_EQ("Calendar 3 Updated", updateCalendarTest.GetCalendar("Test Account 1", "calendar3-test").calendarName); + ASSERT_EQ("Calendar 4 Updated", updateCalendarTest.GetCalendar("Test Account 2", "calendar1-test").calendarName); + ASSERT_EQ("Calendar 5 Updated", updateCalendarTest.GetCalendar("Test Account 2", "calendar2-test").calendarName); + ASSERT_EQ("Calendar 6 Updated", updateCalendarTest.GetCalendar("Test Account 2", "calendar3-test").calendarName); + + ASSERT_EQ("Calendar Description 1 Updated", updateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarDescription); + ASSERT_EQ("Calendar Description 2 Updated", updateCalendarTest.GetCalendar("Test Account 1", "calendar2-test").calendarDescription); + ASSERT_EQ("Calendar Description 3 Updated", updateCalendarTest.GetCalendar("Test Account 1", "calendar3-test").calendarDescription); + ASSERT_EQ("Calendar Description 4 Updated", updateCalendarTest.GetCalendar("Test Account 2", "calendar1-test").calendarDescription); + ASSERT_EQ("Calendar Description 5 Updated", updateCalendarTest.GetCalendar("Test Account 2", "calendar2-test").calendarDescription); + ASSERT_EQ("Calendar Description 6 Updated", updateCalendarTest.GetCalendar("Test Account 2", "calendar3-test").calendarDescription); } TEST(CalendarDataStorage, Update_Three_Calendars_With_Three_Accounts){ - CalendarDataStorage UpdateCalendarTest; - - UpdateCalendarTest.AddAccount("Test Account 1"); - 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")); - - CDSGetCalendarInfo calendar1Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test"); - CDSGetCalendarInfo calendar2Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar2-test"); - CDSGetCalendarInfo calendar3Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar3-test"); - CDSGetCalendarInfo calendar4Info = UpdateCalendarTest.GetCalendar("Test Account 2", "calendar1-test"); - CDSGetCalendarInfo calendar5Info = UpdateCalendarTest.GetCalendar("Test Account 2", "calendar2-test"); - CDSGetCalendarInfo calendar6Info = UpdateCalendarTest.GetCalendar("Test Account 2", "calendar3-test"); - CDSGetCalendarInfo calendar7Info = UpdateCalendarTest.GetCalendar("Test Account 3", "calendar1-test"); - CDSGetCalendarInfo calendar8Info = UpdateCalendarTest.GetCalendar("Test Account 3", "calendar2-test"); - CDSGetCalendarInfo calendar9Info = UpdateCalendarTest.GetCalendar("Test Account 3", "calendar3-test"); - - ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar1Info.calendarID, "Calendar 1 Updated")); - ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar2Info.calendarID, "Calendar 2 Updated")); - ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar3Info.calendarID, "Calendar 3 Updated")); - ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar4Info.calendarID, "Calendar 4 Updated")); - ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar5Info.calendarID, "Calendar 5 Updated")); - ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar6Info.calendarID, "Calendar 6 Updated")); - ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar7Info.calendarID, "Calendar 7 Updated")); - ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar8Info.calendarID, "Calendar 8 Updated")); - ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar9Info.calendarID, "Calendar 9 Updated")); - - ASSERT_EQ("Calendar 1 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarName); - ASSERT_EQ("Calendar 2 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar2-test").calendarName); - ASSERT_EQ("Calendar 3 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar3-test").calendarName); - ASSERT_EQ("Calendar 4 Updated", UpdateCalendarTest.GetCalendar("Test Account 2", "calendar1-test").calendarName); - ASSERT_EQ("Calendar 5 Updated", UpdateCalendarTest.GetCalendar("Test Account 2", "calendar2-test").calendarName); - ASSERT_EQ("Calendar 6 Updated", UpdateCalendarTest.GetCalendar("Test Account 2", "calendar3-test").calendarName); - ASSERT_EQ("Calendar 7 Updated", UpdateCalendarTest.GetCalendar("Test Account 3", "calendar1-test").calendarName); - ASSERT_EQ("Calendar 8 Updated", UpdateCalendarTest.GetCalendar("Test Account 3", "calendar2-test").calendarName); - ASSERT_EQ("Calendar 9 Updated", UpdateCalendarTest.GetCalendar("Test Account 3", "calendar3-test").calendarName); + CalendarDataStorage updateCalendarTest; + + updateCalendarTest.AddAccount("Test Account 1", 1); + updateCalendarTest.AddAccount("Test Account 2", 2); + updateCalendarTest.AddAccount("Test Account 3", 3); + + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.AddCalendar(updateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", defaultColour, "Calendar Description 1")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.AddCalendar(updateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", defaultColour, "Calendar Description 2")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.AddCalendar(updateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", defaultColour, "Calendar Description 3")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.AddCalendar(updateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 4", "calendar1-test", defaultColour, "Calendar Description 4")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.AddCalendar(updateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 5", "calendar2-test", defaultColour, "Calendar Description 5")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.AddCalendar(updateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 6", "calendar3-test", defaultColour, "Calendar Description 6")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.AddCalendar(updateCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 7", "calendar1-test", defaultColour, "Calendar Description 7")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.AddCalendar(updateCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 8", "calendar2-test", defaultColour, "Calendar Description 8")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.AddCalendar(updateCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 9", "calendar3-test", defaultColour, "Calendar Description 9")); + + CDSGetCalendarInfo calendar1Info = updateCalendarTest.GetCalendar("Test Account 1", "calendar1-test"); + CDSGetCalendarInfo calendar2Info = updateCalendarTest.GetCalendar("Test Account 1", "calendar2-test"); + CDSGetCalendarInfo calendar3Info = updateCalendarTest.GetCalendar("Test Account 1", "calendar3-test"); + CDSGetCalendarInfo calendar4Info = updateCalendarTest.GetCalendar("Test Account 2", "calendar1-test"); + CDSGetCalendarInfo calendar5Info = updateCalendarTest.GetCalendar("Test Account 2", "calendar2-test"); + CDSGetCalendarInfo calendar6Info = updateCalendarTest.GetCalendar("Test Account 2", "calendar3-test"); + CDSGetCalendarInfo calendar7Info = updateCalendarTest.GetCalendar("Test Account 3", "calendar1-test"); + CDSGetCalendarInfo calendar8Info = updateCalendarTest.GetCalendar("Test Account 3", "calendar2-test"); + CDSGetCalendarInfo calendar9Info = updateCalendarTest.GetCalendar("Test Account 3", "calendar3-test"); + + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.UpdateCalendar(calendar1Info.calendarID, "Calendar 1 Updated", defaultColour, "Calendar Description 1 Updated")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.UpdateCalendar(calendar2Info.calendarID, "Calendar 2 Updated", defaultColour, "Calendar Description 2 Updated")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.UpdateCalendar(calendar3Info.calendarID, "Calendar 3 Updated", defaultColour, "Calendar Description 3 Updated")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.UpdateCalendar(calendar4Info.calendarID, "Calendar 4 Updated", defaultColour, "Calendar Description 4 Updated")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.UpdateCalendar(calendar5Info.calendarID, "Calendar 5 Updated", defaultColour, "Calendar Description 5 Updated")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.UpdateCalendar(calendar6Info.calendarID, "Calendar 6 Updated", defaultColour, "Calendar Description 6 Updated")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.UpdateCalendar(calendar7Info.calendarID, "Calendar 7 Updated", defaultColour, "Calendar Description 7 Updated")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.UpdateCalendar(calendar8Info.calendarID, "Calendar 8 Updated", defaultColour, "Calendar Description 8 Updated")); + ASSERT_EQ(CDSCALENDAR_OK, updateCalendarTest.UpdateCalendar(calendar9Info.calendarID, "Calendar 9 Updated", defaultColour, "Calendar Description 9 Updated")); + + ASSERT_EQ("Calendar 1 Updated", updateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarName); + ASSERT_EQ("Calendar 2 Updated", updateCalendarTest.GetCalendar("Test Account 1", "calendar2-test").calendarName); + ASSERT_EQ("Calendar 3 Updated", updateCalendarTest.GetCalendar("Test Account 1", "calendar3-test").calendarName); + ASSERT_EQ("Calendar 4 Updated", updateCalendarTest.GetCalendar("Test Account 2", "calendar1-test").calendarName); + ASSERT_EQ("Calendar 5 Updated", updateCalendarTest.GetCalendar("Test Account 2", "calendar2-test").calendarName); + ASSERT_EQ("Calendar 6 Updated", updateCalendarTest.GetCalendar("Test Account 2", "calendar3-test").calendarName); + ASSERT_EQ("Calendar 7 Updated", updateCalendarTest.GetCalendar("Test Account 3", "calendar1-test").calendarName); + ASSERT_EQ("Calendar 8 Updated", updateCalendarTest.GetCalendar("Test Account 3", "calendar2-test").calendarName); + ASSERT_EQ("Calendar 9 Updated", updateCalendarTest.GetCalendar("Test Account 3", "calendar3-test").calendarName); + + ASSERT_EQ("Calendar Description 1 Updated", updateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarDescription); + ASSERT_EQ("Calendar Description 2 Updated", updateCalendarTest.GetCalendar("Test Account 1", "calendar2-test").calendarDescription); + ASSERT_EQ("Calendar Description 3 Updated", updateCalendarTest.GetCalendar("Test Account 1", "calendar3-test").calendarDescription); + ASSERT_EQ("Calendar Description 4 Updated", updateCalendarTest.GetCalendar("Test Account 2", "calendar1-test").calendarDescription); + ASSERT_EQ("Calendar Description 5 Updated", updateCalendarTest.GetCalendar("Test Account 2", "calendar2-test").calendarDescription); + ASSERT_EQ("Calendar Description 6 Updated", updateCalendarTest.GetCalendar("Test Account 2", "calendar3-test").calendarDescription); + ASSERT_EQ("Calendar Description 7 Updated", updateCalendarTest.GetCalendar("Test Account 3", "calendar1-test").calendarDescription); + ASSERT_EQ("Calendar Description 8 Updated", updateCalendarTest.GetCalendar("Test Account 3", "calendar2-test").calendarDescription); + ASSERT_EQ("Calendar Description 9 Updated", updateCalendarTest.GetCalendar("Test Account 3", "calendar3-test").calendarDescription); } TEST(CalendarDataStorage, Delete_One_Calendar){ - CalendarDataStorage DeleteCalendarTest; + CalendarDataStorage deleteCalendarTest; int calendarID = 0; - DeleteCalendarTest.AddAccount("Test Account 1"); + deleteCalendarTest.AddAccount("Test Account 1", 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, "Calendar Description 1")); - calendarID = DeleteCalendarTest.GetCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountName, "calendar1-test").calendarID; + calendarID = deleteCalendarTest.GetCalendar(deleteCalendarTest.GetAccount("Test Account 1").accountName, "calendar1-test").calendarID; - ASSERT_EQ(CDSCALENDAR_OK, DeleteCalendarTest.DeleteCalendar(calendarID)); + ASSERT_EQ(CDSCALENDAR_OK, deleteCalendarTest.DeleteCalendar(calendarID)); } TEST(CalendarDataStorage, Delete_Two_Calendars){ - CalendarDataStorage DeleteCalendarTest; + CalendarDataStorage deleteCalendarTest; int calendarID1 = 0; int calendarID2 = 0; - DeleteCalendarTest.AddAccount("Test Account 1"); - DeleteCalendarTest.AddAccount("Test Account 2"); + deleteCalendarTest.AddAccount("Test Account 1", 1); + deleteCalendarTest.AddAccount("Test Account 2", 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, "Calendar Description 1")); + ASSERT_EQ(CDSCALENDAR_OK, deleteCalendarTest.AddCalendar(deleteCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", defaultColour, "Calendar Description 1")); - calendarID1 = DeleteCalendarTest.GetCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountName, "calendar1-test").calendarID; - calendarID2 = DeleteCalendarTest.GetCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountName, "calendar2-test").calendarID; + calendarID1 = deleteCalendarTest.GetCalendar(deleteCalendarTest.GetAccount("Test Account 1").accountName, "calendar1-test").calendarID; + calendarID2 = deleteCalendarTest.GetCalendar(deleteCalendarTest.GetAccount("Test Account 1").accountName, "calendar2-test").calendarID; - ASSERT_EQ(CDSCALENDAR_OK, DeleteCalendarTest.DeleteCalendar(calendarID1)); - ASSERT_EQ(CDSCALENDAR_OK, DeleteCalendarTest.DeleteCalendar(calendarID2)); + ASSERT_EQ(CDSCALENDAR_OK, deleteCalendarTest.DeleteCalendar(calendarID1)); + ASSERT_EQ(CDSCALENDAR_OK, deleteCalendarTest.DeleteCalendar(calendarID2)); } TEST(CalendarDataStorage, Delete_Three_Calendars){ - CalendarDataStorage DeleteCalendarTest; + CalendarDataStorage deleteCalendarTest; int calendarID1 = 0; int calendarID2 = 0; int calendarID3 = 0; - DeleteCalendarTest.AddAccount("Test Account 1"); - DeleteCalendarTest.AddAccount("Test Account 2"); - DeleteCalendarTest.AddAccount("Test Account 3"); + deleteCalendarTest.AddAccount("Test Account 1", 1); + deleteCalendarTest.AddAccount("Test Account 2", 2); + deleteCalendarTest.AddAccount("Test Account 3", 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, "Calendar Description 1")); + ASSERT_EQ(CDSCALENDAR_OK, deleteCalendarTest.AddCalendar(deleteCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", defaultColour, "Calendar Description 1")); + ASSERT_EQ(CDSCALENDAR_OK, deleteCalendarTest.AddCalendar(deleteCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", defaultColour, "Calendar Description 1")); - calendarID1 = DeleteCalendarTest.GetCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountName, "calendar1-test").calendarID; - calendarID2 = DeleteCalendarTest.GetCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountName, "calendar2-test").calendarID; - calendarID3 = DeleteCalendarTest.GetCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountName, "calendar3-test").calendarID; + calendarID1 = deleteCalendarTest.GetCalendar(deleteCalendarTest.GetAccount("Test Account 1").accountName, "calendar1-test").calendarID; + calendarID2 = deleteCalendarTest.GetCalendar(deleteCalendarTest.GetAccount("Test Account 1").accountName, "calendar2-test").calendarID; + calendarID3 = deleteCalendarTest.GetCalendar(deleteCalendarTest.GetAccount("Test Account 1").accountName, "calendar3-test").calendarID; - ASSERT_EQ(CDSCALENDAR_OK, DeleteCalendarTest.DeleteCalendar(calendarID1)); - ASSERT_EQ(CDSCALENDAR_OK, DeleteCalendarTest.DeleteCalendar(calendarID2)); - ASSERT_EQ(CDSCALENDAR_OK, DeleteCalendarTest.DeleteCalendar(calendarID3)); + ASSERT_EQ(CDSCALENDAR_OK, deleteCalendarTest.DeleteCalendar(calendarID1)); + ASSERT_EQ(CDSCALENDAR_OK, deleteCalendarTest.DeleteCalendar(calendarID2)); + ASSERT_EQ(CDSCALENDAR_OK, deleteCalendarTest.DeleteCalendar(calendarID3)); } TEST(CalendarDataStorage, Add_One_Event){ - CalendarDataStorage AddEventTest; + CalendarDataStorage addEventTest; - AddEventTest.AddAccount("Test Account 1"); - AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test"); + addEventTest.AddAccount("Test Account 1", 1); + addEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", defaultColour, "Calendar Description 1"); - CDSAddEntryResult addEventResult = AddEventTest.AddEvent(1, "CalendarEvent1.ics"); + CDSAddEntryResult addEventResult = addEventTest.AddEvent(1, "CalendarEvent1.ics"); ASSERT_EQ(CDSENTRY_OK, addEventResult.addEventResult); ASSERT_EQ(1, addEventResult.calendarEntryID); @@ -948,17 +1094,17 @@ TEST(CalendarDataStorage, Add_One_Event){ TEST(CalendarDataStorage, Add_Two_Events){ - CalendarDataStorage AddEventTest; + CalendarDataStorage addEventTest; - AddEventTest.AddAccount("Test Account 1"); - AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test"); + addEventTest.AddAccount("Test Account 1", 1); + addEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", defaultColour, "Calendar Description 1"); - CDSAddEntryResult addEvent1Result = AddEventTest.AddEvent(1, "CalendarEvent1.ics"); + CDSAddEntryResult addEvent1Result = addEventTest.AddEvent(1, "CalendarEvent1.ics"); ASSERT_EQ(CDSENTRY_OK, addEvent1Result.addEventResult); ASSERT_EQ(1, addEvent1Result.calendarEntryID); - CDSAddEntryResult addEvent2Result = AddEventTest.AddEvent(1, "CalendarEvent1.ics"); + CDSAddEntryResult addEvent2Result = addEventTest.AddEvent(1, "CalendarEvent1.ics"); ASSERT_EQ(CDSENTRY_OK, addEvent2Result.addEventResult); ASSERT_EQ(2, addEvent2Result.calendarEntryID); @@ -967,22 +1113,22 @@ TEST(CalendarDataStorage, Add_Two_Events){ TEST(CalendarDataStorage, Add_Three_Events){ - CalendarDataStorage AddEventTest; + CalendarDataStorage addEventTest; - AddEventTest.AddAccount("Test Account 1"); - AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test"); + addEventTest.AddAccount("Test Account 1", 1); + addEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", defaultColour, "Calendar Description 1"); - CDSAddEntryResult addEvent1Result = AddEventTest.AddEvent(1, "CalendarEvent1.ics"); + CDSAddEntryResult addEvent1Result = addEventTest.AddEvent(1, "CalendarEvent1.ics"); ASSERT_EQ(CDSENTRY_OK, addEvent1Result.addEventResult); ASSERT_EQ(1, addEvent1Result.calendarEntryID); - CDSAddEntryResult addEvent2Result = AddEventTest.AddEvent(1, "CalendarEvent1.ics"); + CDSAddEntryResult addEvent2Result = addEventTest.AddEvent(1, "CalendarEvent1.ics"); ASSERT_EQ(CDSENTRY_OK, addEvent2Result.addEventResult); ASSERT_EQ(2, addEvent2Result.calendarEntryID); - CDSAddEntryResult addEvent3Result = AddEventTest.AddEvent(1, "CalendarEvent1.ics"); + CDSAddEntryResult addEvent3Result = addEventTest.AddEvent(1, "CalendarEvent1.ics"); ASSERT_EQ(CDSENTRY_OK, addEvent3Result.addEventResult); ASSERT_EQ(3, addEvent3Result.calendarEntryID); @@ -991,15 +1137,15 @@ TEST(CalendarDataStorage, Add_Three_Events){ TEST(CalendarDataStorage, Add_One_Event_And_Get_Event_Basic_Information){ - CalendarDataStorage AddEventTest; + CalendarDataStorage addEventTest; - AddEventTest.AddAccount("Test Account 1"); - AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test"); - CDSAddEntryResult addEventResult = AddEventTest.AddEvent(1, "CalendarEvent1.ics"); + addEventTest.AddAccount("Test Account 1", 1); + addEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", defaultColour, "Calendar Description 1"); + CDSAddEntryResult addEventResult = addEventTest.AddEvent(1, "CalendarEvent1.ics"); // Get the entry information. - CDSGetCalendarEntryInfo entryInfo = AddEventTest.GetEvent(addEventResult.calendarEntryID); + CDSGetCalendarEntryInfo entryInfo = addEventTest.GetEvent(addEventResult.calendarEntryID); ASSERT_EQ(CDSENTRY_OK, entryInfo.getEventResult); ASSERT_EQ("First test event", entryInfo.entryName); @@ -1021,17 +1167,17 @@ TEST(CalendarDataStorage, Add_One_Event_And_Get_Event_Basic_Information){ TEST(CalendarDataStorage, Add_One_Event_And_Get_Event_Basic_Information_With_Duration){ - CalendarDataStorage AddEventTest; + CalendarDataStorage addEventTest; - AddEventTest.AddAccount("Test Account 1"); - AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test"); - CDSAddEntryResult addEventResult = AddEventTest.AddEvent(1, "CalendarEvent2.ics"); + addEventTest.AddAccount("Test Account 1", 1); + addEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", defaultColour, "Calendar Description 1"); + CDSAddEntryResult addEventResult = addEventTest.AddEvent(1, "CalendarEvent2.ics"); EXPECT_EQ(CDSENTRY_OK, addEventResult.addEventResult); // Get the entry information. - CDSGetCalendarEntryInfo entryInfo = AddEventTest.GetEvent(addEventResult.calendarEntryID); + CDSGetCalendarEntryInfo entryInfo = addEventTest.GetEvent(addEventResult.calendarEntryID); ASSERT_EQ(CDSENTRY_OK, entryInfo.getEventResult); ASSERT_EQ("Second test event", entryInfo.entryName); @@ -1058,16 +1204,16 @@ TEST(CalendarDataStorage, Add_One_Event_And_Get_Event_Basic_Information_With_Dur TEST(CalendarDataStorage, Add_Two_Events_And_Get_Event_Basic_Information){ - CalendarDataStorage AddEventTest; + CalendarDataStorage addEventTest; - AddEventTest.AddAccount("Test Account 1"); - AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test"); - CDSAddEntryResult addEvent1Result = AddEventTest.AddEvent(1, "CalendarEvent1.ics"); - CDSAddEntryResult addEvent2Result = AddEventTest.AddEvent(1, "CalendarEvent2.ics"); + addEventTest.AddAccount("Test Account 1", 1); + addEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", defaultColour, "Calendar Description 1"); + CDSAddEntryResult addEvent1Result = addEventTest.AddEvent(1, "CalendarEvent1.ics"); + CDSAddEntryResult addEvent2Result = addEventTest.AddEvent(1, "CalendarEvent2.ics"); // Get the entry information. - CDSGetCalendarEntryInfo entry1Info = AddEventTest.GetEvent(addEvent1Result.calendarEntryID); + CDSGetCalendarEntryInfo entry1Info = addEventTest.GetEvent(addEvent1Result.calendarEntryID); ASSERT_EQ(CDSENTRY_OK, entry1Info.getEventResult); ASSERT_EQ(CDSENTRY_OK, entry1Info.getEventResult); @@ -1086,7 +1232,7 @@ TEST(CalendarDataStorage, Add_Two_Events_And_Get_Event_Basic_Information){ ASSERT_EQ(30, entry1Info.entryEndMinute); ASSERT_EQ(0, entry1Info.entryEndSecond); - CDSGetCalendarEntryInfo entry2Info = AddEventTest.GetEvent(addEvent2Result.calendarEntryID); + CDSGetCalendarEntryInfo entry2Info = addEventTest.GetEvent(addEvent2Result.calendarEntryID); ASSERT_EQ(CDSENTRY_OK, entry2Info.getEventResult); ASSERT_EQ(CDSENTRY_OK, entry2Info.getEventResult); @@ -1114,17 +1260,17 @@ TEST(CalendarDataStorage, Add_Two_Events_And_Get_Event_Basic_Information){ TEST(CalendarDataStorage, Add_The_Same_Three_Events_And_Get_Event_Information){ - CalendarDataStorage AddEventTest; + CalendarDataStorage addEventTest; - AddEventTest.AddAccount("Test Account 1"); - AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test"); - CDSAddEntryResult addEvent1Result = AddEventTest.AddEvent(1, "CalendarEvent1.ics"); - CDSAddEntryResult addEvent2Result = AddEventTest.AddEvent(1, "CalendarEvent1.ics"); - CDSAddEntryResult addEvent3Result = AddEventTest.AddEvent(1, "CalendarEvent1.ics"); + addEventTest.AddAccount("Test Account 1", 1); + addEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", defaultColour, "Calendar Description 1"); + CDSAddEntryResult addEvent1Result = addEventTest.AddEvent(1, "CalendarEvent1.ics"); + CDSAddEntryResult addEvent2Result = addEventTest.AddEvent(1, "CalendarEvent1.ics"); + CDSAddEntryResult addEvent3Result = addEventTest.AddEvent(1, "CalendarEvent1.ics"); // Get the entry information. - CDSGetCalendarEntryInfo entry1Info = AddEventTest.GetEvent(addEvent1Result.calendarEntryID); + CDSGetCalendarEntryInfo entry1Info = addEventTest.GetEvent(addEvent1Result.calendarEntryID); ASSERT_EQ(CDSENTRY_OK, entry1Info.getEventResult); ASSERT_EQ(CDSENTRY_OK, entry1Info.getEventResult); @@ -1143,7 +1289,7 @@ TEST(CalendarDataStorage, Add_The_Same_Three_Events_And_Get_Event_Information){ ASSERT_EQ(30, entry1Info.entryEndMinute); ASSERT_EQ(0, entry1Info.entryEndSecond); - CDSGetCalendarEntryInfo entry2Info = AddEventTest.GetEvent(addEvent2Result.calendarEntryID); + CDSGetCalendarEntryInfo entry2Info = addEventTest.GetEvent(addEvent2Result.calendarEntryID); ASSERT_EQ(CDSENTRY_OK, entry2Info.getEventResult); ASSERT_EQ(CDSENTRY_OK, entry2Info.getEventResult); @@ -1162,7 +1308,7 @@ TEST(CalendarDataStorage, Add_The_Same_Three_Events_And_Get_Event_Information){ ASSERT_EQ(30, entry2Info.entryEndMinute); ASSERT_EQ(0, entry2Info.entryEndSecond); - CDSGetCalendarEntryInfo entry3Info = AddEventTest.GetEvent(addEvent3Result.calendarEntryID); + CDSGetCalendarEntryInfo entry3Info = addEventTest.GetEvent(addEvent3Result.calendarEntryID); ASSERT_EQ(CDSENTRY_OK, entry3Info.getEventResult); ASSERT_EQ(CDSENTRY_OK, entry3Info.getEventResult); @@ -1185,17 +1331,17 @@ TEST(CalendarDataStorage, Add_The_Same_Three_Events_And_Get_Event_Information){ TEST(CalendarDataStorage, Add_Three_Events_And_Get_Event_Information){ - CalendarDataStorage AddEventTest; + CalendarDataStorage addEventTest; - AddEventTest.AddAccount("Test Account 1"); - AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test"); - CDSAddEntryResult addEvent1Result = AddEventTest.AddEvent(1, "CalendarEvent1.ics"); - CDSAddEntryResult addEvent2Result = AddEventTest.AddEvent(1, "CalendarEvent2.ics"); - CDSAddEntryResult addEvent3Result = AddEventTest.AddEvent(1, "CalendarEvent3.ics"); + addEventTest.AddAccount("Test Account 1", 1); + addEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", defaultColour, "Calendar Description 1"); + CDSAddEntryResult addEvent1Result = addEventTest.AddEvent(1, "CalendarEvent1.ics"); + CDSAddEntryResult addEvent2Result = addEventTest.AddEvent(1, "CalendarEvent2.ics"); + CDSAddEntryResult addEvent3Result = addEventTest.AddEvent(1, "CalendarEvent3.ics"); // Get the entry information. - CDSGetCalendarEntryInfo entry1Info = AddEventTest.GetEvent(addEvent1Result.calendarEntryID); + CDSGetCalendarEntryInfo entry1Info = addEventTest.GetEvent(addEvent1Result.calendarEntryID); ASSERT_EQ(CDSENTRY_OK, entry1Info.getEventResult); ASSERT_EQ(CDSENTRY_OK, entry1Info.getEventResult); @@ -1214,7 +1360,7 @@ TEST(CalendarDataStorage, Add_Three_Events_And_Get_Event_Information){ ASSERT_EQ(30, entry1Info.entryEndMinute); ASSERT_EQ(0, entry1Info.entryEndSecond); - CDSGetCalendarEntryInfo entry2Info = AddEventTest.GetEvent(addEvent2Result.calendarEntryID); + CDSGetCalendarEntryInfo entry2Info = addEventTest.GetEvent(addEvent2Result.calendarEntryID); ASSERT_EQ(CDSENTRY_OK, entry2Info.getEventResult); ASSERT_EQ(CDSENTRY_OK, entry2Info.getEventResult); @@ -1238,7 +1384,7 @@ TEST(CalendarDataStorage, Add_Three_Events_And_Get_Event_Information){ ASSERT_EQ(30, entry2Info.entryDurationMinutes); ASSERT_EQ(15, entry2Info.entryDurationSeconds); - CDSGetCalendarEntryInfo entry3Info = AddEventTest.GetEvent(addEvent3Result.calendarEntryID); + CDSGetCalendarEntryInfo entry3Info = addEventTest.GetEvent(addEvent3Result.calendarEntryID); ASSERT_EQ(CDSENTRY_OK, entry3Info.getEventResult); ASSERT_EQ(CDSENTRY_OK, entry3Info.getEventResult); @@ -1261,304 +1407,304 @@ TEST(CalendarDataStorage, Add_Three_Events_And_Get_Event_Information){ TEST(CalendarDataStorage, Delete_One_Event){ - CalendarDataStorage DeleteEventTest; + CalendarDataStorage deleteEventTest; - DeleteEventTest.AddAccount("Test Account 1"); - DeleteEventTest.AddCalendar(1, "Calendar 1", "calendar1-test"); - CDSAddEntryResult addEventResult = DeleteEventTest.AddEvent(1, "CalendarEvent1.ics"); + deleteEventTest.AddAccount("Test Account 1", 1); + deleteEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", defaultColour, "Calendar Description 1"); + CDSAddEntryResult addEventResult = deleteEventTest.AddEvent(1, "CalendarEvent1.ics"); EXPECT_EQ(CDSENTRY_OK, addEventResult.addEventResult); - ASSERT_EQ(CDSENTRY_OK, DeleteEventTest.DeleteEvent(addEventResult.calendarEntryID)); + ASSERT_EQ(CDSENTRY_OK, deleteEventTest.DeleteEvent(addEventResult.calendarEntryID)); } TEST(CalendarDataStorage, Delete_Two_Events){ - CalendarDataStorage DeleteEventTest; + CalendarDataStorage deleteEventTest; - DeleteEventTest.AddAccount("Test Account 1"); - DeleteEventTest.AddCalendar(1, "Calendar 1", "calendar1-test"); - CDSAddEntryResult addEvent1Result = DeleteEventTest.AddEvent(1, "CalendarEvent1.ics"); - CDSAddEntryResult addEvent2Result = DeleteEventTest.AddEvent(1, "CalendarEvent2.ics"); + deleteEventTest.AddAccount("Test Account 1", 1); + deleteEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", defaultColour, "Calendar Description 1"); + CDSAddEntryResult addEvent1Result = deleteEventTest.AddEvent(1, "CalendarEvent1.ics"); + CDSAddEntryResult addEvent2Result = deleteEventTest.AddEvent(1, "CalendarEvent2.ics"); EXPECT_EQ(CDSENTRY_OK, addEvent1Result.addEventResult); EXPECT_EQ(CDSENTRY_OK, addEvent2Result.addEventResult); - ASSERT_EQ(CDSENTRY_OK, DeleteEventTest.DeleteEvent(addEvent1Result.calendarEntryID)); - ASSERT_EQ(CDSENTRY_OK, DeleteEventTest.DeleteEvent(addEvent2Result.calendarEntryID)); + ASSERT_EQ(CDSENTRY_OK, deleteEventTest.DeleteEvent(addEvent1Result.calendarEntryID)); + ASSERT_EQ(CDSENTRY_OK, deleteEventTest.DeleteEvent(addEvent2Result.calendarEntryID)); } TEST(CalendarDataStorage, Delete_Three_Events){ - CalendarDataStorage DeleteEventTest; + CalendarDataStorage deleteEventTest; - DeleteEventTest.AddAccount("Test Account 1"); - DeleteEventTest.AddCalendar(1, "Calendar 1", "calendar1-test"); - CDSAddEntryResult addEvent1Result = DeleteEventTest.AddEvent(1, "CalendarEvent1.ics"); - CDSAddEntryResult addEvent2Result = DeleteEventTest.AddEvent(1, "CalendarEvent2.ics"); - CDSAddEntryResult addEvent3Result = DeleteEventTest.AddEvent(1, "CalendarEvent3.ics"); + deleteEventTest.AddAccount("Test Account 1", 1); + deleteEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", defaultColour, "Calendar Description 1"); + CDSAddEntryResult addEvent1Result = deleteEventTest.AddEvent(1, "CalendarEvent1.ics"); + CDSAddEntryResult addEvent2Result = deleteEventTest.AddEvent(1, "CalendarEvent2.ics"); + CDSAddEntryResult addEvent3Result = deleteEventTest.AddEvent(1, "CalendarEvent3.ics"); EXPECT_EQ(CDSENTRY_OK, addEvent1Result.addEventResult); EXPECT_EQ(CDSENTRY_OK, addEvent2Result.addEventResult); EXPECT_EQ(CDSENTRY_OK, addEvent3Result.addEventResult); - ASSERT_EQ(CDSENTRY_OK, DeleteEventTest.DeleteEvent(addEvent1Result.calendarEntryID)); - ASSERT_EQ(CDSENTRY_OK, DeleteEventTest.DeleteEvent(addEvent2Result.calendarEntryID)); - ASSERT_EQ(CDSENTRY_OK, DeleteEventTest.DeleteEvent(addEvent3Result.calendarEntryID)); + ASSERT_EQ(CDSENTRY_OK, deleteEventTest.DeleteEvent(addEvent1Result.calendarEntryID)); + ASSERT_EQ(CDSENTRY_OK, deleteEventTest.DeleteEvent(addEvent2Result.calendarEntryID)); + ASSERT_EQ(CDSENTRY_OK, deleteEventTest.DeleteEvent(addEvent3Result.calendarEntryID)); } TEST(CalendarDataStorage, Delete_One_Calendar_And_Events){ - CalendarDataStorage DeleteEventTest; + CalendarDataStorage deleteEventTest; - DeleteEventTest.AddAccount("Test Account 1"); - DeleteEventTest.AddCalendar(1, "Calendar 1", "calendar1-test"); - CDSAddEntryResult addEvent1Result = DeleteEventTest.AddEvent(1, "CalendarEvent1.ics"); - CDSAddEntryResult addEvent2Result = DeleteEventTest.AddEvent(1, "CalendarEvent2.ics"); - CDSAddEntryResult addEvent3Result = DeleteEventTest.AddEvent(1, "CalendarEvent3.ics"); + deleteEventTest.AddAccount("Test Account 1", 1); + deleteEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", defaultColour, "Calendar Description 1"); + CDSAddEntryResult addEvent1Result = deleteEventTest.AddEvent(1, "CalendarEvent1.ics"); + CDSAddEntryResult addEvent2Result = deleteEventTest.AddEvent(1, "CalendarEvent2.ics"); + CDSAddEntryResult addEvent3Result = deleteEventTest.AddEvent(1, "CalendarEvent3.ics"); - EXPECT_EQ(CDSCALENDAR_OK, DeleteEventTest.DeleteCalendar(1)); + EXPECT_EQ(CDSCALENDAR_OK, deleteEventTest.DeleteCalendar(1)); - EXPECT_EQ(CDSENTRY_NOENTRY, DeleteEventTest.GetEvent(addEvent1Result.calendarEntryID).getEventResult); - EXPECT_EQ(CDSENTRY_NOENTRY, DeleteEventTest.GetEvent(addEvent2Result.calendarEntryID).getEventResult); - EXPECT_EQ(CDSENTRY_NOENTRY, DeleteEventTest.GetEvent(addEvent3Result.calendarEntryID).getEventResult); + EXPECT_EQ(CDSENTRY_NOENTRY, deleteEventTest.GetEvent(addEvent1Result.calendarEntryID).getEventResult); + EXPECT_EQ(CDSENTRY_NOENTRY, deleteEventTest.GetEvent(addEvent2Result.calendarEntryID).getEventResult); + EXPECT_EQ(CDSENTRY_NOENTRY, deleteEventTest.GetEvent(addEvent3Result.calendarEntryID).getEventResult); } TEST(CalendarDataStorage, Delete_Two_Calendars_And_Events){ - CalendarDataStorage DeleteEventTest; + CalendarDataStorage deleteEventTest; - DeleteEventTest.AddAccount("Test Account 1"); - DeleteEventTest.AddCalendar(1, "Calendar 1", "calendar1-test"); - DeleteEventTest.AddCalendar(1, "Calendar 1", "calendar2-test"); + deleteEventTest.AddAccount("Test Account 1", 1); + deleteEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", defaultColour, "Calendar Description 1"); + deleteEventTest.AddCalendar(1, "Calendar 1", "calendar2-test", defaultColour, "Calendar Description 1"); // Setup and delete the first calendar. - CDSAddEntryResult addEvent1Result = DeleteEventTest.AddEvent(1, "CalendarEvent1.ics"); - CDSAddEntryResult addEvent2Result = DeleteEventTest.AddEvent(1, "CalendarEvent2.ics"); - CDSAddEntryResult addEvent3Result = DeleteEventTest.AddEvent(1, "CalendarEvent3.ics"); + CDSAddEntryResult addEvent1Result = deleteEventTest.AddEvent(1, "CalendarEvent1.ics"); + CDSAddEntryResult addEvent2Result = deleteEventTest.AddEvent(1, "CalendarEvent2.ics"); + CDSAddEntryResult addEvent3Result = deleteEventTest.AddEvent(1, "CalendarEvent3.ics"); - EXPECT_EQ(CDSCALENDAR_OK, DeleteEventTest.DeleteCalendar(1)); + EXPECT_EQ(CDSCALENDAR_OK, deleteEventTest.DeleteCalendar(1)); - EXPECT_EQ(CDSENTRY_NOENTRY, DeleteEventTest.GetEvent(addEvent1Result.calendarEntryID).getEventResult); - EXPECT_EQ(CDSENTRY_NOENTRY, DeleteEventTest.GetEvent(addEvent2Result.calendarEntryID).getEventResult); - EXPECT_EQ(CDSENTRY_NOENTRY, DeleteEventTest.GetEvent(addEvent3Result.calendarEntryID).getEventResult); + EXPECT_EQ(CDSENTRY_NOENTRY, deleteEventTest.GetEvent(addEvent1Result.calendarEntryID).getEventResult); + EXPECT_EQ(CDSENTRY_NOENTRY, deleteEventTest.GetEvent(addEvent2Result.calendarEntryID).getEventResult); + EXPECT_EQ(CDSENTRY_NOENTRY, deleteEventTest.GetEvent(addEvent3Result.calendarEntryID).getEventResult); // Setup and delete the second calendar. - addEvent1Result = DeleteEventTest.AddEvent(2, "CalendarEvent1.ics"); - addEvent2Result = DeleteEventTest.AddEvent(2, "CalendarEvent2.ics"); - addEvent3Result = DeleteEventTest.AddEvent(2, "CalendarEvent3.ics"); + addEvent1Result = deleteEventTest.AddEvent(2, "CalendarEvent1.ics"); + addEvent2Result = deleteEventTest.AddEvent(2, "CalendarEvent2.ics"); + addEvent3Result = deleteEventTest.AddEvent(2, "CalendarEvent3.ics"); - EXPECT_EQ(CDSCALENDAR_OK, DeleteEventTest.DeleteCalendar(2)); + EXPECT_EQ(CDSCALENDAR_OK, deleteEventTest.DeleteCalendar(2)); - EXPECT_EQ(CDSENTRY_NOENTRY, DeleteEventTest.GetEvent(addEvent1Result.calendarEntryID).getEventResult); - EXPECT_EQ(CDSENTRY_NOENTRY, DeleteEventTest.GetEvent(addEvent2Result.calendarEntryID).getEventResult); - EXPECT_EQ(CDSENTRY_NOENTRY, DeleteEventTest.GetEvent(addEvent3Result.calendarEntryID).getEventResult); + EXPECT_EQ(CDSENTRY_NOENTRY, deleteEventTest.GetEvent(addEvent1Result.calendarEntryID).getEventResult); + EXPECT_EQ(CDSENTRY_NOENTRY, deleteEventTest.GetEvent(addEvent2Result.calendarEntryID).getEventResult); + EXPECT_EQ(CDSENTRY_NOENTRY, deleteEventTest.GetEvent(addEvent3Result.calendarEntryID).getEventResult); } TEST(CalendarDataStorage, Delete_Three_Calendars_And_Events){ - CalendarDataStorage DeleteEventTest; + 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.AddAccount("Test Account 1", 1); + deleteEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", defaultColour, "Calendar Description 1"); + deleteEventTest.AddCalendar(1, "Calendar 2", "calendar2-test", defaultColour, "Calendar Description 1"); + deleteEventTest.AddCalendar(1, "Calendar 3", "calendar3-test", defaultColour, "Calendar Description 1"); // Setup and delete the first calendar. - CDSAddEntryResult addEvent1Result = DeleteEventTest.AddEvent(1, "CalendarEvent1.ics"); - CDSAddEntryResult addEvent2Result = DeleteEventTest.AddEvent(1, "CalendarEvent2.ics"); - CDSAddEntryResult addEvent3Result = DeleteEventTest.AddEvent(1, "CalendarEvent3.ics"); + CDSAddEntryResult addEvent1Result = deleteEventTest.AddEvent(1, "CalendarEvent1.ics"); + CDSAddEntryResult addEvent2Result = deleteEventTest.AddEvent(1, "CalendarEvent2.ics"); + CDSAddEntryResult addEvent3Result = deleteEventTest.AddEvent(1, "CalendarEvent3.ics"); - EXPECT_EQ(CDSCALENDAR_OK, DeleteEventTest.DeleteCalendar(1)); + EXPECT_EQ(CDSCALENDAR_OK, deleteEventTest.DeleteCalendar(1)); - EXPECT_EQ(CDSENTRY_NOENTRY, DeleteEventTest.GetEvent(addEvent1Result.calendarEntryID).getEventResult); - EXPECT_EQ(CDSENTRY_NOENTRY, DeleteEventTest.GetEvent(addEvent2Result.calendarEntryID).getEventResult); - EXPECT_EQ(CDSENTRY_NOENTRY, DeleteEventTest.GetEvent(addEvent3Result.calendarEntryID).getEventResult); + EXPECT_EQ(CDSENTRY_NOENTRY, deleteEventTest.GetEvent(addEvent1Result.calendarEntryID).getEventResult); + EXPECT_EQ(CDSENTRY_NOENTRY, deleteEventTest.GetEvent(addEvent2Result.calendarEntryID).getEventResult); + EXPECT_EQ(CDSENTRY_NOENTRY, deleteEventTest.GetEvent(addEvent3Result.calendarEntryID).getEventResult); // Setup and delete the second calendar. - addEvent1Result = DeleteEventTest.AddEvent(2, "CalendarEvent1.ics"); - addEvent2Result = DeleteEventTest.AddEvent(2, "CalendarEvent2.ics"); - addEvent3Result = DeleteEventTest.AddEvent(2, "CalendarEvent3.ics"); + addEvent1Result = deleteEventTest.AddEvent(2, "CalendarEvent1.ics"); + addEvent2Result = deleteEventTest.AddEvent(2, "CalendarEvent2.ics"); + addEvent3Result = deleteEventTest.AddEvent(2, "CalendarEvent3.ics"); - EXPECT_EQ(CDSCALENDAR_OK, DeleteEventTest.DeleteCalendar(2)); + EXPECT_EQ(CDSCALENDAR_OK, deleteEventTest.DeleteCalendar(2)); - EXPECT_EQ(CDSENTRY_NOENTRY, DeleteEventTest.GetEvent(addEvent1Result.calendarEntryID).getEventResult); - EXPECT_EQ(CDSENTRY_NOENTRY, DeleteEventTest.GetEvent(addEvent2Result.calendarEntryID).getEventResult); - EXPECT_EQ(CDSENTRY_NOENTRY, DeleteEventTest.GetEvent(addEvent3Result.calendarEntryID).getEventResult); + EXPECT_EQ(CDSENTRY_NOENTRY, deleteEventTest.GetEvent(addEvent1Result.calendarEntryID).getEventResult); + EXPECT_EQ(CDSENTRY_NOENTRY, deleteEventTest.GetEvent(addEvent2Result.calendarEntryID).getEventResult); + EXPECT_EQ(CDSENTRY_NOENTRY, deleteEventTest.GetEvent(addEvent3Result.calendarEntryID).getEventResult); // Setup and delete the third calendar. - addEvent1Result = DeleteEventTest.AddEvent(3, "CalendarEvent1.ics"); - addEvent2Result = DeleteEventTest.AddEvent(3, "CalendarEvent2.ics"); - addEvent3Result = DeleteEventTest.AddEvent(3, "CalendarEvent3.ics"); + addEvent1Result = deleteEventTest.AddEvent(3, "CalendarEvent1.ics"); + addEvent2Result = deleteEventTest.AddEvent(3, "CalendarEvent2.ics"); + addEvent3Result = deleteEventTest.AddEvent(3, "CalendarEvent3.ics"); - EXPECT_EQ(CDSCALENDAR_OK, DeleteEventTest.DeleteCalendar(3)); + EXPECT_EQ(CDSCALENDAR_OK, deleteEventTest.DeleteCalendar(3)); - EXPECT_EQ(CDSENTRY_NOENTRY, DeleteEventTest.GetEvent(addEvent1Result.calendarEntryID).getEventResult); - EXPECT_EQ(CDSENTRY_NOENTRY, DeleteEventTest.GetEvent(addEvent2Result.calendarEntryID).getEventResult); - EXPECT_EQ(CDSENTRY_NOENTRY, DeleteEventTest.GetEvent(addEvent3Result.calendarEntryID).getEventResult); + EXPECT_EQ(CDSENTRY_NOENTRY, deleteEventTest.GetEvent(addEvent1Result.calendarEntryID).getEventResult); + EXPECT_EQ(CDSENTRY_NOENTRY, deleteEventTest.GetEvent(addEvent2Result.calendarEntryID).getEventResult); + EXPECT_EQ(CDSENTRY_NOENTRY, deleteEventTest.GetEvent(addEvent3Result.calendarEntryID).getEventResult); } TEST(CalendarDataStorage, Delete_One_Account_And_Associated_Data){ - CalendarDataStorage DeleteAccountTest; + CalendarDataStorage deleteAccountTest; - DeleteAccountTest.AddAccount("Test Account 1"); - DeleteAccountTest.AddCalendar(1, "Calendar 1", "calendar1-test"); + deleteAccountTest.AddAccount("Test Account 1", 1); + deleteAccountTest.AddCalendar(1, "Calendar 1", "calendar1-test", defaultColour, "Calendar Description 1"); // Setup and delete the first account. - CDSAddEntryResult addEvent1Result = DeleteAccountTest.AddEvent(1, "CalendarEvent1.ics"); - CDSAddEntryResult addEvent2Result = DeleteAccountTest.AddEvent(1, "CalendarEvent2.ics"); - CDSAddEntryResult addEvent3Result = DeleteAccountTest.AddEvent(1, "CalendarEvent3.ics"); + CDSAddEntryResult addEvent1Result = deleteAccountTest.AddEvent(1, "CalendarEvent1.ics"); + CDSAddEntryResult addEvent2Result = deleteAccountTest.AddEvent(1, "CalendarEvent2.ics"); + CDSAddEntryResult addEvent3Result = deleteAccountTest.AddEvent(1, "CalendarEvent3.ics"); - EXPECT_EQ(CDSCALENDAR_OK, DeleteAccountTest.DeleteAccount(1)); + EXPECT_EQ(CDSCALENDAR_OK, deleteAccountTest.DeleteAccount(1)); - EXPECT_EQ(CDSENTRY_NOACCOUNT, DeleteAccountTest.GetCalendar("Test Account 1", "calendar1-test").calendarInfoResult); + EXPECT_EQ(CDSENTRY_NOACCOUNT, deleteAccountTest.GetCalendar("Test Account 1", "calendar1-test").calendarInfoResult); - EXPECT_EQ(CDSENTRY_NOENTRY, DeleteAccountTest.GetEvent(addEvent1Result.calendarEntryID).getEventResult); - EXPECT_EQ(CDSENTRY_NOENTRY, DeleteAccountTest.GetEvent(addEvent2Result.calendarEntryID).getEventResult); - EXPECT_EQ(CDSENTRY_NOENTRY, DeleteAccountTest.GetEvent(addEvent3Result.calendarEntryID).getEventResult); + EXPECT_EQ(CDSENTRY_NOENTRY, deleteAccountTest.GetEvent(addEvent1Result.calendarEntryID).getEventResult); + EXPECT_EQ(CDSENTRY_NOENTRY, deleteAccountTest.GetEvent(addEvent2Result.calendarEntryID).getEventResult); + EXPECT_EQ(CDSENTRY_NOENTRY, deleteAccountTest.GetEvent(addEvent3Result.calendarEntryID).getEventResult); } TEST(CalendarDataStorage, Delete_Two_Accounts_And_Associated_Data){ - CalendarDataStorage DeleteAccountTest; + CalendarDataStorage deleteAccountTest; - DeleteAccountTest.AddAccount("Test Account 1"); - DeleteAccountTest.AddAccount("Test Account 2"); - DeleteAccountTest.AddAccount("Test Account 3"); + deleteAccountTest.AddAccount("Test Account 1", 1); + deleteAccountTest.AddAccount("Test Account 2", 2); + deleteAccountTest.AddAccount("Test Account 3", 3); // 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, "Calendar Description 1"); + deleteAccountTest.AddCalendar(1, "Calendar 2", "calendar1-test", defaultColour, "Calendar Description 1"); + deleteAccountTest.AddCalendar(1, "Calendar 3", "calendar1-test", defaultColour, "Calendar Description 1"); - CDSAddEntryResult addEvent1Result = DeleteAccountTest.AddEvent(1, "CalendarEvent1.ics"); - CDSAddEntryResult addEvent2Result = DeleteAccountTest.AddEvent(1, "CalendarEvent2.ics"); - CDSAddEntryResult addEvent3Result = DeleteAccountTest.AddEvent(1, "CalendarEvent3.ics"); + CDSAddEntryResult addEvent1Result = deleteAccountTest.AddEvent(1, "CalendarEvent1.ics"); + CDSAddEntryResult addEvent2Result = deleteAccountTest.AddEvent(1, "CalendarEvent2.ics"); + CDSAddEntryResult addEvent3Result = deleteAccountTest.AddEvent(1, "CalendarEvent3.ics"); - EXPECT_EQ(CDSCALENDAR_OK, DeleteAccountTest.DeleteAccount(1)); + EXPECT_EQ(CDSCALENDAR_OK, deleteAccountTest.DeleteAccount(1)); - EXPECT_EQ(CDSENTRY_NOACCOUNT, DeleteAccountTest.GetCalendar("Test Account 1", "calendar1-test").calendarInfoResult); + EXPECT_EQ(CDSENTRY_NOACCOUNT, deleteAccountTest.GetCalendar("Test Account 1", "calendar1-test").calendarInfoResult); - EXPECT_EQ(CDSENTRY_NOENTRY, DeleteAccountTest.GetEvent(addEvent1Result.calendarEntryID).getEventResult); - EXPECT_EQ(CDSENTRY_NOENTRY, DeleteAccountTest.GetEvent(addEvent2Result.calendarEntryID).getEventResult); - EXPECT_EQ(CDSENTRY_NOENTRY, DeleteAccountTest.GetEvent(addEvent3Result.calendarEntryID).getEventResult); + EXPECT_EQ(CDSENTRY_NOENTRY, deleteAccountTest.GetEvent(addEvent1Result.calendarEntryID).getEventResult); + EXPECT_EQ(CDSENTRY_NOENTRY, deleteAccountTest.GetEvent(addEvent2Result.calendarEntryID).getEventResult); + EXPECT_EQ(CDSENTRY_NOENTRY, deleteAccountTest.GetEvent(addEvent3Result.calendarEntryID).getEventResult); // 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, "Calendar Description 1"); + deleteAccountTest.AddCalendar(2, "Calendar 2", "calendar1-test", defaultColour, "Calendar Description 1"); + deleteAccountTest.AddCalendar(2, "Calendar 3", "calendar1-test", defaultColour, "Calendar Description 1"); - addEvent1Result = DeleteAccountTest.AddEvent(4, "CalendarEvent1.ics"); - addEvent2Result = DeleteAccountTest.AddEvent(4, "CalendarEvent2.ics"); - addEvent3Result = DeleteAccountTest.AddEvent(4, "CalendarEvent3.ics"); + addEvent1Result = deleteAccountTest.AddEvent(4, "CalendarEvent1.ics"); + addEvent2Result = deleteAccountTest.AddEvent(4, "CalendarEvent2.ics"); + addEvent3Result = deleteAccountTest.AddEvent(4, "CalendarEvent3.ics"); - EXPECT_EQ(CDSCALENDAR_OK, DeleteAccountTest.DeleteAccount(2)); + EXPECT_EQ(CDSCALENDAR_OK, deleteAccountTest.DeleteAccount(2)); - EXPECT_EQ(CDSENTRY_NOACCOUNT, DeleteAccountTest.GetCalendar("Test Account 2", "calendar1-test").calendarInfoResult); + EXPECT_EQ(CDSENTRY_NOACCOUNT, deleteAccountTest.GetCalendar("Test Account 2", "calendar1-test").calendarInfoResult); - EXPECT_EQ(CDSENTRY_NOENTRY, DeleteAccountTest.GetEvent(addEvent1Result.calendarEntryID).getEventResult); - EXPECT_EQ(CDSENTRY_NOENTRY, DeleteAccountTest.GetEvent(addEvent2Result.calendarEntryID).getEventResult); - EXPECT_EQ(CDSENTRY_NOENTRY, DeleteAccountTest.GetEvent(addEvent3Result.calendarEntryID).getEventResult); + EXPECT_EQ(CDSENTRY_NOENTRY, deleteAccountTest.GetEvent(addEvent1Result.calendarEntryID).getEventResult); + EXPECT_EQ(CDSENTRY_NOENTRY, deleteAccountTest.GetEvent(addEvent2Result.calendarEntryID).getEventResult); + EXPECT_EQ(CDSENTRY_NOENTRY, deleteAccountTest.GetEvent(addEvent3Result.calendarEntryID).getEventResult); } TEST(CalendarDataStorage, Delete_Three_Accounts_And_Associated_Data){ - CalendarDataStorage DeleteAccountTest; + CalendarDataStorage deleteAccountTest; - DeleteAccountTest.AddAccount("Test Account 1"); - DeleteAccountTest.AddAccount("Test Account 2"); - DeleteAccountTest.AddAccount("Test Account 3"); + deleteAccountTest.AddAccount("Test Account 1", 1); + deleteAccountTest.AddAccount("Test Account 2", 2); + deleteAccountTest.AddAccount("Test Account 3", 3); // 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, "Calendar Description 1"); + deleteAccountTest.AddCalendar(1, "Calendar 2", "calendar1-test", defaultColour, "Calendar Description 1"); + deleteAccountTest.AddCalendar(1, "Calendar 3", "calendar1-test", defaultColour, "Calendar Description 1"); - CDSAddEntryResult addEvent1Result = DeleteAccountTest.AddEvent(1, "CalendarEvent1.ics"); - CDSAddEntryResult addEvent2Result = DeleteAccountTest.AddEvent(1, "CalendarEvent2.ics"); - CDSAddEntryResult addEvent3Result = DeleteAccountTest.AddEvent(1, "CalendarEvent3.ics"); + CDSAddEntryResult addEvent1Result = deleteAccountTest.AddEvent(1, "CalendarEvent1.ics"); + CDSAddEntryResult addEvent2Result = deleteAccountTest.AddEvent(1, "CalendarEvent2.ics"); + CDSAddEntryResult addEvent3Result = deleteAccountTest.AddEvent(1, "CalendarEvent3.ics"); - EXPECT_EQ(CDSCALENDAR_OK, DeleteAccountTest.DeleteAccount(1)); + EXPECT_EQ(CDSCALENDAR_OK, deleteAccountTest.DeleteAccount(1)); - EXPECT_EQ(CDSENTRY_NOACCOUNT, DeleteAccountTest.GetCalendar("Test Account 1", "calendar1-test").calendarInfoResult); + EXPECT_EQ(CDSENTRY_NOACCOUNT, deleteAccountTest.GetCalendar("Test Account 1", "calendar1-test").calendarInfoResult); - EXPECT_EQ(CDSENTRY_NOENTRY, DeleteAccountTest.GetEvent(addEvent1Result.calendarEntryID).getEventResult); - EXPECT_EQ(CDSENTRY_NOENTRY, DeleteAccountTest.GetEvent(addEvent2Result.calendarEntryID).getEventResult); - EXPECT_EQ(CDSENTRY_NOENTRY, DeleteAccountTest.GetEvent(addEvent3Result.calendarEntryID).getEventResult); + EXPECT_EQ(CDSENTRY_NOENTRY, deleteAccountTest.GetEvent(addEvent1Result.calendarEntryID).getEventResult); + EXPECT_EQ(CDSENTRY_NOENTRY, deleteAccountTest.GetEvent(addEvent2Result.calendarEntryID).getEventResult); + EXPECT_EQ(CDSENTRY_NOENTRY, deleteAccountTest.GetEvent(addEvent3Result.calendarEntryID).getEventResult); // 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, "Calendar Description 1"); + deleteAccountTest.AddCalendar(2, "Calendar 2", "calendar1-test", defaultColour, "Calendar Description 1"); + deleteAccountTest.AddCalendar(2, "Calendar 3", "calendar1-test", defaultColour, "Calendar Description 1"); - addEvent1Result = DeleteAccountTest.AddEvent(4, "CalendarEvent1.ics"); - addEvent2Result = DeleteAccountTest.AddEvent(4, "CalendarEvent2.ics"); - addEvent3Result = DeleteAccountTest.AddEvent(4, "CalendarEvent3.ics"); + addEvent1Result = deleteAccountTest.AddEvent(4, "CalendarEvent1.ics"); + addEvent2Result = deleteAccountTest.AddEvent(4, "CalendarEvent2.ics"); + addEvent3Result = deleteAccountTest.AddEvent(4, "CalendarEvent3.ics"); - EXPECT_EQ(CDSCALENDAR_OK, DeleteAccountTest.DeleteAccount(2)); + EXPECT_EQ(CDSCALENDAR_OK, deleteAccountTest.DeleteAccount(2)); - EXPECT_EQ(CDSENTRY_NOACCOUNT, DeleteAccountTest.GetCalendar("Test Account 2", "calendar1-test").calendarInfoResult); + EXPECT_EQ(CDSENTRY_NOACCOUNT, deleteAccountTest.GetCalendar("Test Account 2", "calendar1-test").calendarInfoResult); - EXPECT_EQ(CDSENTRY_NOENTRY, DeleteAccountTest.GetEvent(addEvent1Result.calendarEntryID).getEventResult); - EXPECT_EQ(CDSENTRY_NOENTRY, DeleteAccountTest.GetEvent(addEvent2Result.calendarEntryID).getEventResult); - EXPECT_EQ(CDSENTRY_NOENTRY, DeleteAccountTest.GetEvent(addEvent3Result.calendarEntryID).getEventResult); + EXPECT_EQ(CDSENTRY_NOENTRY, deleteAccountTest.GetEvent(addEvent1Result.calendarEntryID).getEventResult); + EXPECT_EQ(CDSENTRY_NOENTRY, deleteAccountTest.GetEvent(addEvent2Result.calendarEntryID).getEventResult); + EXPECT_EQ(CDSENTRY_NOENTRY, deleteAccountTest.GetEvent(addEvent3Result.calendarEntryID).getEventResult); // 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, "Calendar Description 1"); + deleteAccountTest.AddCalendar(3, "Calendar 2", "calendar1-test", defaultColour, "Calendar Description 1"); + deleteAccountTest.AddCalendar(3, "Calendar 3", "calendar1-test", defaultColour, "Calendar Description 1"); - addEvent1Result = DeleteAccountTest.AddEvent(7, "CalendarEvent1.ics"); - addEvent2Result = DeleteAccountTest.AddEvent(7, "CalendarEvent2.ics"); - addEvent3Result = DeleteAccountTest.AddEvent(7, "CalendarEvent3.ics"); + addEvent1Result = deleteAccountTest.AddEvent(7, "CalendarEvent1.ics"); + addEvent2Result = deleteAccountTest.AddEvent(7, "CalendarEvent2.ics"); + addEvent3Result = deleteAccountTest.AddEvent(7, "CalendarEvent3.ics"); - EXPECT_EQ(CDSCALENDAR_OK, DeleteAccountTest.DeleteAccount(3)); + EXPECT_EQ(CDSCALENDAR_OK, deleteAccountTest.DeleteAccount(3)); - EXPECT_EQ(CDSENTRY_NOACCOUNT, DeleteAccountTest.GetCalendar("Test Account 3", "calendar1-test").calendarInfoResult); + EXPECT_EQ(CDSENTRY_NOACCOUNT, deleteAccountTest.GetCalendar("Test Account 3", "calendar1-test").calendarInfoResult); - EXPECT_EQ(CDSENTRY_NOENTRY, DeleteAccountTest.GetEvent(addEvent1Result.calendarEntryID).getEventResult); - EXPECT_EQ(CDSENTRY_NOENTRY, DeleteAccountTest.GetEvent(addEvent2Result.calendarEntryID).getEventResult); - EXPECT_EQ(CDSENTRY_NOENTRY, DeleteAccountTest.GetEvent(addEvent3Result.calendarEntryID).getEventResult); + EXPECT_EQ(CDSENTRY_NOENTRY, deleteAccountTest.GetEvent(addEvent1Result.calendarEntryID).getEventResult); + EXPECT_EQ(CDSENTRY_NOENTRY, deleteAccountTest.GetEvent(addEvent2Result.calendarEntryID).getEventResult); + EXPECT_EQ(CDSENTRY_NOENTRY, deleteAccountTest.GetEvent(addEvent3Result.calendarEntryID).getEventResult); } TEST(CalendarDataStorage, Get_List_Of_Events_For_One_Account){ - CalendarDataStorage GetEventsListTest; + CalendarDataStorage getEventsListTest; - GetEventsListTest.AddAccount("Test Account 1"); + getEventsListTest.AddAccount("Test Account 1", 1); // 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, "Calendar Description 1"); + getEventsListTest.AddCalendar(1, "Calendar 2", "calendar1-test", defaultColour, "Calendar Description 1"); + getEventsListTest.AddCalendar(1, "Calendar 3", "calendar1-test", defaultColour, "Calendar Description 1"); - CDSAddEntryResult addEvent1Result = GetEventsListTest.AddEvent(1, "CalendarEvent1.ics"); - CDSAddEntryResult addEvent2Result = GetEventsListTest.AddEvent(1, "CalendarEvent2.ics"); - CDSAddEntryResult addEvent3Result = GetEventsListTest.AddEvent(1, "CalendarEvent3.ics"); + CDSAddEntryResult addEvent1Result = getEventsListTest.AddEvent(1, "CalendarEvent1.ics"); + CDSAddEntryResult addEvent2Result = getEventsListTest.AddEvent(1, "CalendarEvent2.ics"); + CDSAddEntryResult addEvent3Result = getEventsListTest.AddEvent(1, "CalendarEvent3.ics"); - CDSEntryList entryList = GetEventsListTest.GetEventList(1); + CDSEntryList entryList = getEventsListTest.GetEventList(1); EXPECT_EQ(1, entryList.entryList.at(0)); EXPECT_EQ(2, entryList.entryList.at(1)); @@ -1568,23 +1714,23 @@ TEST(CalendarDataStorage, Get_List_Of_Events_For_One_Account){ TEST(CalendarDataStorage, Get_List_Of_Events_For_Two_Accounts){ - CalendarDataStorage GetEventsListTest; + CalendarDataStorage getEventsListTest; - GetEventsListTest.AddAccount("Test Account 1"); + getEventsListTest.AddAccount("Test Account 1", 1); // 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, "Calendar Description 1"); + getEventsListTest.AddCalendar(1, "Calendar 2", "calendar1-test", defaultColour, "Calendar Description 1"); + getEventsListTest.AddCalendar(1, "Calendar 3", "calendar1-test", defaultColour, "Calendar Description 1"); // Setup the first account. - CDSAddEntryResult addEvent1Result = GetEventsListTest.AddEvent(1, "CalendarEvent1.ics"); - CDSAddEntryResult addEvent2Result = GetEventsListTest.AddEvent(1, "CalendarEvent2.ics"); - CDSAddEntryResult addEvent3Result = GetEventsListTest.AddEvent(1, "CalendarEvent3.ics"); + CDSAddEntryResult addEvent1Result = getEventsListTest.AddEvent(1, "CalendarEvent1.ics"); + CDSAddEntryResult addEvent2Result = getEventsListTest.AddEvent(1, "CalendarEvent2.ics"); + CDSAddEntryResult addEvent3Result = getEventsListTest.AddEvent(1, "CalendarEvent3.ics"); - CDSEntryList entryList = GetEventsListTest.GetEventList(1); + CDSEntryList entryList = getEventsListTest.GetEventList(1); EXPECT_EQ(1, entryList.entryList.at(0)); EXPECT_EQ(2, entryList.entryList.at(1)); @@ -1592,11 +1738,11 @@ TEST(CalendarDataStorage, Get_List_Of_Events_For_Two_Accounts){ // Setup the second account. - addEvent1Result = GetEventsListTest.AddEvent(2, "CalendarEvent1.ics"); - addEvent2Result = GetEventsListTest.AddEvent(2, "CalendarEvent2.ics"); - addEvent3Result = GetEventsListTest.AddEvent(2, "CalendarEvent3.ics"); + addEvent1Result = getEventsListTest.AddEvent(2, "CalendarEvent1.ics"); + addEvent2Result = getEventsListTest.AddEvent(2, "CalendarEvent2.ics"); + addEvent3Result = getEventsListTest.AddEvent(2, "CalendarEvent3.ics"); - entryList = GetEventsListTest.GetEventList(2); + entryList = getEventsListTest.GetEventList(2); EXPECT_EQ(4, entryList.entryList.at(0)); EXPECT_EQ(5, entryList.entryList.at(1)); @@ -1606,23 +1752,23 @@ TEST(CalendarDataStorage, Get_List_Of_Events_For_Two_Accounts){ TEST(CalendarDataStorage, Get_List_Of_Events_For_Three_Accounts){ - CalendarDataStorage GetEventsListTest; + CalendarDataStorage getEventsListTest; - GetEventsListTest.AddAccount("Test Account 1"); + getEventsListTest.AddAccount("Test Account 1", 1); // 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, "Calendar Description 1"); + getEventsListTest.AddCalendar(1, "Calendar 2", "calendar1-test", defaultColour, "Calendar Description 1"); + getEventsListTest.AddCalendar(1, "Calendar 3", "calendar1-test", defaultColour, "Calendar Description 1"); // Setup the first account. - CDSAddEntryResult addEvent1Result = GetEventsListTest.AddEvent(1, "CalendarEvent1.ics"); - CDSAddEntryResult addEvent2Result = GetEventsListTest.AddEvent(1, "CalendarEvent2.ics"); - CDSAddEntryResult addEvent3Result = GetEventsListTest.AddEvent(1, "CalendarEvent3.ics"); + CDSAddEntryResult addEvent1Result = getEventsListTest.AddEvent(1, "CalendarEvent1.ics"); + CDSAddEntryResult addEvent2Result = getEventsListTest.AddEvent(1, "CalendarEvent2.ics"); + CDSAddEntryResult addEvent3Result = getEventsListTest.AddEvent(1, "CalendarEvent3.ics"); - CDSEntryList entryList = GetEventsListTest.GetEventList(1); + CDSEntryList entryList = getEventsListTest.GetEventList(1); EXPECT_EQ(1, entryList.entryList.at(0)); EXPECT_EQ(2, entryList.entryList.at(1)); @@ -1630,11 +1776,11 @@ TEST(CalendarDataStorage, Get_List_Of_Events_For_Three_Accounts){ // Setup the second account. - addEvent1Result = GetEventsListTest.AddEvent(2, "CalendarEvent1.ics"); - addEvent2Result = GetEventsListTest.AddEvent(2, "CalendarEvent2.ics"); - addEvent3Result = GetEventsListTest.AddEvent(2, "CalendarEvent3.ics"); + addEvent1Result = getEventsListTest.AddEvent(2, "CalendarEvent1.ics"); + addEvent2Result = getEventsListTest.AddEvent(2, "CalendarEvent2.ics"); + addEvent3Result = getEventsListTest.AddEvent(2, "CalendarEvent3.ics"); - entryList = GetEventsListTest.GetEventList(2); + entryList = getEventsListTest.GetEventList(2); EXPECT_EQ(4, entryList.entryList.at(0)); EXPECT_EQ(5, entryList.entryList.at(1)); @@ -1642,11 +1788,11 @@ TEST(CalendarDataStorage, Get_List_Of_Events_For_Three_Accounts){ // Setup the third account. - addEvent1Result = GetEventsListTest.AddEvent(3, "CalendarEvent1.ics"); - addEvent2Result = GetEventsListTest.AddEvent(3, "CalendarEvent2.ics"); - addEvent3Result = GetEventsListTest.AddEvent(3, "CalendarEvent3.ics"); + addEvent1Result = getEventsListTest.AddEvent(3, "CalendarEvent1.ics"); + addEvent2Result = getEventsListTest.AddEvent(3, "CalendarEvent2.ics"); + addEvent3Result = getEventsListTest.AddEvent(3, "CalendarEvent3.ics"); - entryList = GetEventsListTest.GetEventList(3); + entryList = getEventsListTest.GetEventList(3); EXPECT_EQ(7, entryList.entryList.at(0)); EXPECT_EQ(8, entryList.entryList.at(1)); @@ -1656,19 +1802,19 @@ TEST(CalendarDataStorage, Get_List_Of_Events_For_Three_Accounts){ TEST(CalendarDataStorage, Get_List_Of_Calendars_For_One_Account){ - CalendarDataStorage GetEventsListTest; + CalendarDataStorage getEventsListTest; + + getEventsListTest.AddAccount("Test Account 1", 1); - 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, "Calendar Description 1"); + getEventsListTest.AddCalendar(1, "Calendar 2", "calendar2-test", defaultColour, "Calendar Description 1"); + getEventsListTest.AddCalendar(1, "Calendar 3", "calendar3-test", defaultColour, "Calendar Description 1"); // Get the list of calendar IDs. - CDSCalendarList calendarList = GetEventsListTest.GetCalendarList(1); + CDSCalendarList calendarList = getEventsListTest.GetCalendarList(1); EXPECT_EQ(1, calendarList.calendarList.at(0)); EXPECT_EQ(2, calendarList.calendarList.at(1)); @@ -1682,20 +1828,20 @@ TEST(CalendarDataStorage, Get_List_Of_Calendars_For_One_Account){ TEST(CalendarDataStorage, Get_List_Of_Calendars_For_Two_Accounts){ - CalendarDataStorage GetEventsListTest; + CalendarDataStorage getEventsListTest; + + getEventsListTest.AddAccount("Test Account 1", 1); + getEventsListTest.AddAccount("Test Account 2", 2); - 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, "Calendar Description 1"); + getEventsListTest.AddCalendar(1, "Calendar 2", "calendar2-test", defaultColour, "Calendar Description 1"); + getEventsListTest.AddCalendar(1, "Calendar 3", "calendar3-test", defaultColour, "Calendar Description 1"); // Get the list of calendar IDs. - CDSCalendarList calendarList = GetEventsListTest.GetCalendarList(1); + CDSCalendarList calendarList = getEventsListTest.GetCalendarList(1); EXPECT_EQ(1, calendarList.calendarList.at(0)); EXPECT_EQ(2, calendarList.calendarList.at(1)); @@ -1707,11 +1853,11 @@ 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, "Calendar Description 1"); + getEventsListTest.AddCalendar(2, "Calendar 5", "calendar5-test", defaultColour, "Calendar Description 1"); + getEventsListTest.AddCalendar(2, "Calendar 6", "calendar6-test", defaultColour, "Calendar Description 1"); - calendarList = GetEventsListTest.GetCalendarList(2); + calendarList = getEventsListTest.GetCalendarList(2); EXPECT_EQ(4, calendarList.calendarList.at(0)); EXPECT_EQ(5, calendarList.calendarList.at(1)); @@ -1725,21 +1871,21 @@ TEST(CalendarDataStorage, Get_List_Of_Calendars_For_Two_Accounts){ TEST(CalendarDataStorage, Get_List_Of_Calendars_For_Three_Accounts){ - CalendarDataStorage GetEventsListTest; + CalendarDataStorage getEventsListTest; + + getEventsListTest.AddAccount("Test Account 1", 1); + getEventsListTest.AddAccount("Test Account 2", 2); + getEventsListTest.AddAccount("Test Account 3", 3); - 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, "Calendar Description 1"); + getEventsListTest.AddCalendar(1, "Calendar 2", "calendar2-test", defaultColour, "Calendar Description 1"); + getEventsListTest.AddCalendar(1, "Calendar 3", "calendar3-test", defaultColour, "Calendar Description 1"); // Get the list of calendar IDs. - CDSCalendarList calendarList = GetEventsListTest.GetCalendarList(1); + CDSCalendarList calendarList = getEventsListTest.GetCalendarList(1); EXPECT_EQ(1, calendarList.calendarList.at(0)); EXPECT_EQ(2, calendarList.calendarList.at(1)); @@ -1751,11 +1897,11 @@ 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, "Calendar Description 1"); + getEventsListTest.AddCalendar(2, "Calendar 5", "calendar5-test", defaultColour, "Calendar Description 1"); + getEventsListTest.AddCalendar(2, "Calendar 6", "calendar6-test", defaultColour, "Calendar Description 1"); - calendarList = GetEventsListTest.GetCalendarList(2); + calendarList = getEventsListTest.GetCalendarList(2); EXPECT_EQ(4, calendarList.calendarList.at(0)); EXPECT_EQ(5, calendarList.calendarList.at(1)); @@ -1767,11 +1913,11 @@ 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, "Calendar Description 1"); + getEventsListTest.AddCalendar(3, "Calendar 8", "calendar8-test", defaultColour, "Calendar Description 1"); + getEventsListTest.AddCalendar(3, "Calendar 9", "calendar9-test", defaultColour, "Calendar Description 1"); - calendarList = GetEventsListTest.GetCalendarList(3); + calendarList = getEventsListTest.GetCalendarList(3); EXPECT_EQ(7, calendarList.calendarList.at(0)); EXPECT_EQ(8, calendarList.calendarList.at(1)); @@ -1781,4 +1927,212 @@ TEST(CalendarDataStorage, Get_List_Of_Calendars_For_Three_Accounts){ EXPECT_EQ("calendar8-test", calendarList.calendarListTextID.at(1)); EXPECT_EQ("calendar9-test", calendarList.calendarListTextID.at(2)); +} + +TEST(CalendarDataStorage, Add_One_Checksum){ + + CalendarDataStorage checksumTest; + + EXPECT_EQ(CDSCHECKSUM_OK, checksumTest.AddChecksum("firstChecksum", "checksumYay")); + + // Get the checksum. + + //EXPECT_EQ("checksumYay", checksumTest.GetChecksum("firstChecksum")); + +} + +TEST(CalendarDataStorage, Add_Two_Checksus){ + + CalendarDataStorage checksumTest; + + EXPECT_EQ(CDSCHECKSUM_OK, checksumTest.AddChecksum("firstChecksum", "checksumYay")); + EXPECT_EQ(CDSCHECKSUM_OK, checksumTest.AddChecksum("secondChecksum", "checksumTwo")); + +} + +TEST(CalendarDataStorage, Add_Three_Checksus){ + + CalendarDataStorage checksumTest; + + EXPECT_EQ(CDSCHECKSUM_OK, checksumTest.AddChecksum("firstChecksum", "checksumYay")); + EXPECT_EQ(CDSCHECKSUM_OK, checksumTest.AddChecksum("secondChecksum", "checksumTwo")); + EXPECT_EQ(CDSCHECKSUM_OK, checksumTest.AddChecksum("thirdChecksum", "checksumThree")); + +} + +TEST(CalendarDataStorage, Add_One_Checksum_And_Get_One_Checksum){ + + CalendarDataStorage checksumTest; + + EXPECT_EQ(CDSCHECKSUM_OK, checksumTest.AddChecksum("firstChecksum", "checksumYay")); + + // Get the checksum. + + CDSGetChecksumResult getChecksumResult = checksumTest.GetChecksum("firstChecksum"); + + EXPECT_EQ(CDSCHECKSUM_OK, getChecksumResult.getChecksumResult); + EXPECT_EQ("checksumYay", getChecksumResult.checksumValue); + +} + +TEST(CalendarDataStorage, Add_Two_Checksums_And_Get_Two_Checksums){ + + CalendarDataStorage checksumTest; + + EXPECT_EQ(CDSCHECKSUM_OK, checksumTest.AddChecksum("firstChecksum", "checksumYay")); + EXPECT_EQ(CDSCHECKSUM_OK, checksumTest.AddChecksum("secondChecksum", "checksumTwo")); + + // Get the checksums. + + CDSGetChecksumResult getChecksumResult = checksumTest.GetChecksum("firstChecksum"); + + EXPECT_EQ(CDSCHECKSUM_OK, getChecksumResult.getChecksumResult); + EXPECT_EQ("checksumYay", getChecksumResult.checksumValue); + + getChecksumResult = checksumTest.GetChecksum("secondChecksum"); + + EXPECT_EQ(CDSCHECKSUM_OK, getChecksumResult.getChecksumResult); + EXPECT_EQ("checksumTwo", getChecksumResult.checksumValue); + +} + +TEST(CalendarDataStorage, Add_Three_Checksums_And_Get_Three_Checksums){ + + CalendarDataStorage checksumTest; + + EXPECT_EQ(CDSCHECKSUM_OK, checksumTest.AddChecksum("firstChecksum", "checksumYay")); + EXPECT_EQ(CDSCHECKSUM_OK, checksumTest.AddChecksum("secondChecksum", "checksumTwo")); + EXPECT_EQ(CDSCHECKSUM_OK, checksumTest.AddChecksum("thirdChecksum", "checksumThree")); + + // Get the checksums. + + CDSGetChecksumResult getChecksumResult = checksumTest.GetChecksum("firstChecksum"); + + EXPECT_EQ(CDSCHECKSUM_OK, getChecksumResult.getChecksumResult); + EXPECT_EQ("checksumYay", getChecksumResult.checksumValue); + + getChecksumResult = checksumTest.GetChecksum("secondChecksum"); + + EXPECT_EQ(CDSCHECKSUM_OK, getChecksumResult.getChecksumResult); + EXPECT_EQ("checksumTwo", getChecksumResult.checksumValue); + + getChecksumResult = checksumTest.GetChecksum("thirdChecksum"); + + EXPECT_EQ(CDSCHECKSUM_OK, getChecksumResult.getChecksumResult); + EXPECT_EQ("checksumThree", getChecksumResult.checksumValue); + +} + +TEST(CalendarDataStorage, Add_One_Checksum_Update_One_Checksum_And_Get_One_Checksum){ + + CalendarDataStorage checksumTest; + + EXPECT_EQ(CDSCHECKSUM_OK, checksumTest.AddChecksum("firstChecksum", "checksumYay")); + + // Get the checksum. + + CDSGetChecksumResult getChecksumResult = checksumTest.GetChecksum("firstChecksum"); + + EXPECT_EQ(CDSCHECKSUM_OK, getChecksumResult.getChecksumResult); + EXPECT_EQ("checksumYay", getChecksumResult.checksumValue); + + // Update the checksum. + + EXPECT_EQ(CDSCHECKSUM_OK, checksumTest.UpdateChecksum("firstChecksum", "updatedChecksum1")); + + // Get the checksum again. + + getChecksumResult = checksumTest.GetChecksum("firstChecksum"); + + EXPECT_EQ(CDSCHECKSUM_OK, getChecksumResult.getChecksumResult); + EXPECT_EQ("updatedChecksum1", getChecksumResult.checksumValue); + +} + +TEST(CalendarDataStorage, Add_Two_Checksums_Update_Two_Checksums_And_Get_Two_Checksums){ + + CalendarDataStorage checksumTest; + + EXPECT_EQ(CDSCHECKSUM_OK, checksumTest.AddChecksum("firstChecksum", "checksumYay")); + EXPECT_EQ(CDSCHECKSUM_OK, checksumTest.AddChecksum("secondChecksum", "checksumTwo")); + + // Get the checksum. + + CDSGetChecksumResult getChecksumResult = checksumTest.GetChecksum("firstChecksum"); + + EXPECT_EQ(CDSCHECKSUM_OK, getChecksumResult.getChecksumResult); + EXPECT_EQ("checksumYay", getChecksumResult.checksumValue); + + getChecksumResult = checksumTest.GetChecksum("secondChecksum"); + + EXPECT_EQ(CDSCHECKSUM_OK, getChecksumResult.getChecksumResult); + EXPECT_EQ("checksumTwo", getChecksumResult.checksumValue); + + // Update the checksum. + + EXPECT_EQ(CDSCHECKSUM_OK, checksumTest.UpdateChecksum("firstChecksum", "updatedChecksum1")); + EXPECT_EQ(CDSCHECKSUM_OK, checksumTest.UpdateChecksum("secondChecksum", "updatedChecksum2")); + + // Get the checksum again. + + getChecksumResult = checksumTest.GetChecksum("firstChecksum"); + + EXPECT_EQ(CDSCHECKSUM_OK, getChecksumResult.getChecksumResult); + EXPECT_EQ("updatedChecksum1", getChecksumResult.checksumValue); + + getChecksumResult = checksumTest.GetChecksum("secondChecksum"); + + EXPECT_EQ(CDSCHECKSUM_OK, getChecksumResult.getChecksumResult); + EXPECT_EQ("updatedChecksum2", getChecksumResult.checksumValue); + +} + +TEST(CalendarDataStorage, Add_Three_Checksums_Update_Three_Checksums_And_Get_Three_Checksums){ + + CalendarDataStorage checksumTest; + + EXPECT_EQ(CDSCHECKSUM_OK, checksumTest.AddChecksum("firstChecksum", "checksumYay")); + EXPECT_EQ(CDSCHECKSUM_OK, checksumTest.AddChecksum("secondChecksum", "checksumTwo")); + EXPECT_EQ(CDSCHECKSUM_OK, checksumTest.AddChecksum("thirdChecksum", "checksumThree")); + + // Get the checksum. + + CDSGetChecksumResult getChecksumResult = checksumTest.GetChecksum("firstChecksum"); + + EXPECT_EQ(CDSCHECKSUM_OK, getChecksumResult.getChecksumResult); + EXPECT_EQ("checksumYay", getChecksumResult.checksumValue); + + getChecksumResult = checksumTest.GetChecksum("secondChecksum"); + + EXPECT_EQ(CDSCHECKSUM_OK, getChecksumResult.getChecksumResult); + EXPECT_EQ("checksumTwo", getChecksumResult.checksumValue); + + getChecksumResult = checksumTest.GetChecksum("thirdChecksum"); + + EXPECT_EQ(CDSCHECKSUM_OK, getChecksumResult.getChecksumResult); + EXPECT_EQ("checksumThree", getChecksumResult.checksumValue); + + // Update the checksum. + + EXPECT_EQ(CDSCHECKSUM_OK, checksumTest.UpdateChecksum("firstChecksum", "updatedChecksum1")); + EXPECT_EQ(CDSCHECKSUM_OK, checksumTest.UpdateChecksum("secondChecksum", "updatedChecksum2")); + EXPECT_EQ(CDSCHECKSUM_OK, checksumTest.UpdateChecksum("thirdChecksum", "updatedChecksum3")); + + // Get the checksum again. + + getChecksumResult = checksumTest.GetChecksum("firstChecksum"); + + EXPECT_EQ(CDSCHECKSUM_OK, getChecksumResult.getChecksumResult); + EXPECT_EQ("updatedChecksum1", getChecksumResult.checksumValue); + + getChecksumResult = checksumTest.GetChecksum("secondChecksum"); + + EXPECT_EQ(CDSCHECKSUM_OK, getChecksumResult.getChecksumResult); + EXPECT_EQ("updatedChecksum2", getChecksumResult.checksumValue); + + getChecksumResult = checksumTest.GetChecksum("thirdChecksum"); + + EXPECT_EQ(CDSCHECKSUM_OK, getChecksumResult.getChecksumResult); + EXPECT_EQ("updatedChecksum3", getChecksumResult.checksumValue); + } \ No newline at end of file