X-Git-Url: http://Server1/repobrowser/?p=xestiacalendar%2F.git;a=blobdiff_plain;f=source%2Ftests%2Fxestiacalendar_calendardatastorage.h;h=4e4a95967bddc3642677e167970c5bf41aa765af;hp=9b04282732fe10de79d6d9057e5820c6df18b3d4;hb=48ebeff90fa77e8f38d67f2472fa5eee178cd765;hpb=1fe6e43892e5c572949a293a9e19704b5debadad

diff --git a/source/tests/xestiacalendar_calendardatastorage.h b/source/tests/xestiacalendar_calendardatastorage.h
index 9b04282..4e4a959 100644
--- a/source/tests/xestiacalendar_calendardatastorage.h
+++ b/source/tests/xestiacalendar_calendardatastorage.h
@@ -55,6 +55,23 @@ TEST(CalendarDataStorage, Add_Three_Accounts){
 	
 }
 
+TEST(CalendarDataStorage, Add_Account_With_No_Name_And_Return_No_Name_Message){
+	
+	CalendarDataStorage failNameTest;
+
+	ASSERT_EQ(CDSACCOUNT_NONAME, failNameTest.AddAccount("", 1));
+	
+}
+
+TEST(CalendarDataStorage, Add_Account_With_Same_Name_Twice_And_Return_Failed_Message){
+	
+	CalendarDataStorage duplicateNameTest;
+
+	ASSERT_EQ(CDSACCOUNT_OK, duplicateNameTest.AddAccount("Account 1", 1));
+	ASSERT_EQ(CDSACCOUNT_FAILED, duplicateNameTest.AddAccount("Account 1", 1));
+	
+}
+
 TEST(CalendarDataStorage, Get_Account_Information){
 	
 	CalendarDataStorage accountInformationTest;
@@ -66,6 +83,14 @@ TEST(CalendarDataStorage, Get_Account_Information){
 	
 }
 
+TEST(CalendarDataStorage, Get_Account_Information_That_Does_Not_Exist_Return_No_Account_Message){
+
+	CalendarDataStorage noAccountTest;
+	
+	ASSERT_EQ(CDSACCOUNT_NOACCOUNT, noAccountTest.GetAccount("Test Account 1").accountInfoResult);
+	
+}
+
 TEST(CalendarDataStorage, Get_Two_Accounts_Information){
 	
 	CalendarDataStorage accountInformationTest;
@@ -197,6 +222,41 @@ TEST(CalendarDataStorage, Update_One_Account){
 	
 }
 
+TEST(CalendarDataStorage, Update_One_Account_Set_Account_Name_To_No_Name_Return_No_Name_Message){
+
+	CalendarDataStorage updateAccountTest;
+	
+	updateAccountTest.AddAccount("Test Account 1", 1);
+	
+	int testAccount1ID = updateAccountTest.GetAccount("Test Account 1").accountID;
+	
+	EXPECT_EQ(1, testAccount1ID);
+	ASSERT_EQ(CDSACCOUNT_NONAME, updateAccountTest.UpdateAccount(testAccount1ID, ""));
+	
+}
+
+TEST(CalendarDataStorage, Update_One_Account_Set_Account_Name_To_Existing_Account_Return_Failed_Message){
+
+	CalendarDataStorage updateAccountTest;
+	
+	updateAccountTest.AddAccount("Test Account 1", 1);
+	updateAccountTest.AddAccount("Test Account 2", 2);
+	
+	int testAccount2ID = updateAccountTest.GetAccount("Test Account 2").accountID;
+	
+	EXPECT_EQ(2, testAccount2ID);
+	ASSERT_EQ(CDSACCOUNT_FAILED, updateAccountTest.UpdateAccount(testAccount2ID, "Test Account 1"));
+	
+}
+
+TEST(CalendarDataStorage, Update_One_Account_That_Does_Not_Exist_Return_No_Account_Message){
+
+	CalendarDataStorage updateAccountTest;
+	
+	ASSERT_EQ(CDSACCOUNT_NOACCOUNT, updateAccountTest.UpdateAccount(1, "Missing Account"));
+	
+}
+
 TEST(CalendarDataStorage, Update_Two_Accounts){
 	
 	CalendarDataStorage updateAccountTest;
@@ -288,6 +348,14 @@ TEST(CalendarDataStorage, Delete_Three_Accounts){
 	
 }
 
+TEST(CalendarDataStorage, Delete_Account_That_Does_Not_Exist_Return_No_Account_Message){
+
+	CalendarDataStorage deleteAccountTest;
+	
+	ASSERT_EQ(CDSACCOUNT_NOACCOUNT, deleteAccountTest.DeleteAccount(1));
+	
+}
+
 TEST(CalendarDataStorage, Add_One_Calendar_To_One_Account){
 	
 	CalendarDataStorage addCalendarTest;
@@ -321,6 +389,14 @@ TEST(CalendarDataStorage, Add_Three_Calendars_To_One_Account){
 	
 }
 
+TEST(CalendarDataStorage, Add_Calendar_To_Account_That_Does_Not_Exist_Return_No_Account_Message){
+
+	CalendarDataStorage addCalendarTest;
+
+	ASSERT_EQ(CDSCALENDAR_NOACCOUNT, addCalendarTest.AddCalendar(addCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", defaultColour, "Calendar Description"));
+	
+}
+	
 TEST(CalendarDataStorage, Add_One_Calendar_To_Two_Accounts){
 	
 	CalendarDataStorage addCalendarTest;
@@ -1570,7 +1646,8 @@ TEST(CalendarDataStorage, Delete_One_Account_And_Associated_Data){
 	
 	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").accountInfoResult);
+	EXPECT_EQ(CDSENTRY_NOCALENDAR, 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);
@@ -1598,7 +1675,8 @@ TEST(CalendarDataStorage, Delete_Two_Accounts_And_Associated_Data){
 	
 	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").accountInfoResult);
+	EXPECT_EQ(CDSENTRY_NOCALENDAR, 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);
@@ -1616,7 +1694,8 @@ TEST(CalendarDataStorage, Delete_Two_Accounts_And_Associated_Data){
 	
 	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").accountInfoResult);
+	EXPECT_EQ(CDSENTRY_NOCALENDAR, 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);
@@ -1644,7 +1723,8 @@ TEST(CalendarDataStorage, Delete_Three_Accounts_And_Associated_Data){
 	
 	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").accountInfoResult);
+	EXPECT_EQ(CDSENTRY_NOCALENDAR, 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);
@@ -1662,7 +1742,8 @@ TEST(CalendarDataStorage, Delete_Three_Accounts_And_Associated_Data){
 	
 	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").accountInfoResult);
+	EXPECT_EQ(CDSENTRY_NOCALENDAR, 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);
@@ -1680,7 +1761,8 @@ TEST(CalendarDataStorage, Delete_Three_Accounts_And_Associated_Data){
 	
 	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").accountInfoResult);
+	EXPECT_EQ(CDSENTRY_NOCALENDAR, 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);