unit-test: Refactor unit testing building/running/info collecting for build server

[xestiacalendar/.git] / source / tests / CalendarDataStorageTests / CalendarDataStorageTests.cpp

diff --git a/source/tests/xestiacalendar_calendardatastorage.h b/source/tests/CalendarDataStorageTests/CalendarDataStorageTests.cpp
similarity index 94%
rename from source/tests/xestiacalendar_calendardatastorage.h
rename to source/tests/CalendarDataStorageTests/CalendarDataStorageTests.cpp
index 4e4a959..0dc0077 100644 (file)
--- a/source/tests/xestiacalendar_calendardatastorage.h
+++ b/source/tests/CalendarDataStorageTests/CalendarDataStorageTests.cpp
@@ -17,10 +17,23 @@
 // with Xestia Calendar. If not, see <http://www.gnu.org/licenses/> 
 
 #include "../libraries/CalendarDataStorage/CalendarDataStorage.h"
+#include <gtest/gtest.h>
+
+class CalendarDataStorageTests : public ::testing::Test
+{
+private:
+    virtual void SetUp()
+    {
+    }
+    
+    virtual void TearDown()
+    {
+    }
+};
 
 Colour defaultColour;
 
-TEST(CalendarDataStorage, Setup_Tables){
+TEST_F(CalendarDataStorageTests, Setup_Tables){
        
        CalendarDataStorage setupTablesTest;
        
@@ -28,7 +41,7 @@ TEST(CalendarDataStorage, Setup_Tables){
        
 }
 
-TEST(CalendarDataStorage, Add_One_Account){
+TEST_F(CalendarDataStorageTests, Add_One_Account){
        
        CalendarDataStorage addOneEntryTest;
        
@@ -36,7 +49,7 @@ TEST(CalendarDataStorage, Add_One_Account){
        
 }
 
-TEST(CalendarDataStorage, Add_Two_Accounts){
+TEST_F(CalendarDataStorageTests, Add_Two_Accounts){
        
        CalendarDataStorage addTwoEntryTest;
 
@@ -45,7 +58,7 @@ TEST(CalendarDataStorage, Add_Two_Accounts){
        
 }
 
-TEST(CalendarDataStorage, Add_Three_Accounts){
+TEST_F(CalendarDataStorageTests, Add_Three_Accounts){
        
        CalendarDataStorage addThreeEntryTest;
        
@@ -55,7 +68,7 @@ TEST(CalendarDataStorage, Add_Three_Accounts){
        
 }
 
-TEST(CalendarDataStorage, Add_Account_With_No_Name_And_Return_No_Name_Message){
+TEST_F(CalendarDataStorageTests, Add_Account_With_No_Name_And_Return_No_Name_Message){
        
        CalendarDataStorage failNameTest;
 
@@ -63,7 +76,7 @@ TEST(CalendarDataStorage, Add_Account_With_No_Name_And_Return_No_Name_Message){
        
 }
 
-TEST(CalendarDataStorage, Add_Account_With_Same_Name_Twice_And_Return_Failed_Message){
+TEST_F(CalendarDataStorageTests, Add_Account_With_Same_Name_Twice_And_Return_Failed_Message){
        
        CalendarDataStorage duplicateNameTest;
 
@@ -72,7 +85,7 @@ TEST(CalendarDataStorage, Add_Account_With_Same_Name_Twice_And_Return_Failed_Mes
        
 }
 
-TEST(CalendarDataStorage, Get_Account_Information){
+TEST_F(CalendarDataStorageTests, Get_Account_Information){
        
        CalendarDataStorage accountInformationTest;
        
@@ -83,7 +96,7 @@ TEST(CalendarDataStorage, Get_Account_Information){
        
 }
 
-TEST(CalendarDataStorage, Get_Account_Information_That_Does_Not_Exist_Return_No_Account_Message){
+TEST_F(CalendarDataStorageTests, Get_Account_Information_That_Does_Not_Exist_Return_No_Account_Message){
 
        CalendarDataStorage noAccountTest;
        
@@ -91,7 +104,7 @@ TEST(CalendarDataStorage, Get_Account_Information_That_Does_Not_Exist_Return_No_
        
 }
 
-TEST(CalendarDataStorage, Get_Two_Accounts_Information){
+TEST_F(CalendarDataStorageTests, Get_Two_Accounts_Information){
        
        CalendarDataStorage accountInformationTest;
        
@@ -110,7 +123,7 @@ TEST(CalendarDataStorage, Get_Two_Accounts_Information){
        
 }
 
-TEST(CalendarDataStorage, Get_Three_Accounts_Information){
+TEST_F(CalendarDataStorageTests, Get_Three_Accounts_Information){
        
        CalendarDataStorage accountInformationTest;
        
@@ -135,7 +148,7 @@ TEST(CalendarDataStorage, Get_Three_Accounts_Information){
        
 }
 
-TEST(CalendarDataStorage, Get_List_Of_One_Account){
+TEST_F(CalendarDataStorageTests, Get_List_Of_One_Account){
        
        CalendarDataStorage accountInformationTest;
        
@@ -153,7 +166,7 @@ TEST(CalendarDataStorage, Get_List_Of_One_Account){
        
 }
 
-TEST(CalendarDataStorage, Get_List_Of_Two_Accounts){
+TEST_F(CalendarDataStorageTests, Get_List_Of_Two_Accounts){
        
        CalendarDataStorage accountInformationTest;
        
@@ -177,7 +190,7 @@ TEST(CalendarDataStorage, Get_List_Of_Two_Accounts){
        
 }
 
-TEST(CalendarDataStorage, Get_List_Of_Three_Accounts){
+TEST_F(CalendarDataStorageTests, Get_List_Of_Three_Accounts){
        
        CalendarDataStorage accountInformationTest;
        
@@ -207,7 +220,7 @@ TEST(CalendarDataStorage, Get_List_Of_Three_Accounts){
 
 }
 
-TEST(CalendarDataStorage, Update_One_Account){
+TEST_F(CalendarDataStorageTests, Update_One_Account){
        
        CalendarDataStorage updateAccountTest;
        
@@ -222,7 +235,7 @@ TEST(CalendarDataStorage, Update_One_Account){
        
 }
 
-TEST(CalendarDataStorage, Update_One_Account_Set_Account_Name_To_No_Name_Return_No_Name_Message){
+TEST_F(CalendarDataStorageTests, Update_One_Account_Set_Account_Name_To_No_Name_Return_No_Name_Message){
 
        CalendarDataStorage updateAccountTest;
        
@@ -235,7 +248,7 @@ TEST(CalendarDataStorage, Update_One_Account_Set_Account_Name_To_No_Name_Return_
        
 }
 
-TEST(CalendarDataStorage, Update_One_Account_Set_Account_Name_To_Existing_Account_Return_Failed_Message){
+TEST_F(CalendarDataStorageTests, Update_One_Account_Set_Account_Name_To_Existing_Account_Return_Failed_Message){
 
        CalendarDataStorage updateAccountTest;
        
@@ -249,7 +262,7 @@ TEST(CalendarDataStorage, Update_One_Account_Set_Account_Name_To_Existing_Accoun
        
 }
 
-TEST(CalendarDataStorage, Update_One_Account_That_Does_Not_Exist_Return_No_Account_Message){
+TEST_F(CalendarDataStorageTests, Update_One_Account_That_Does_Not_Exist_Return_No_Account_Message){
 
        CalendarDataStorage updateAccountTest;
        
@@ -257,7 +270,7 @@ TEST(CalendarDataStorage, Update_One_Account_That_Does_Not_Exist_Return_No_Accou
        
 }
 
-TEST(CalendarDataStorage, Update_Two_Accounts){
+TEST_F(CalendarDataStorageTests, Update_Two_Accounts){
        
        CalendarDataStorage updateAccountTest;
        
@@ -281,7 +294,7 @@ TEST(CalendarDataStorage, Update_Two_Accounts){
        
 }
 
-TEST(CalendarDataStorage, Update_Three_Accounts){
+TEST_F(CalendarDataStorageTests, Update_Three_Accounts){
        
        CalendarDataStorage updateAccountTest;
        
@@ -312,7 +325,7 @@ TEST(CalendarDataStorage, Update_Three_Accounts){
 
 }
 
-TEST(CalendarDataStorage, Delete_One_Account){
+TEST_F(CalendarDataStorageTests, Delete_One_Account){
        
        CalendarDataStorage deleteAccountTest;
        
@@ -322,7 +335,7 @@ TEST(CalendarDataStorage, Delete_One_Account){
        
 }
 
-TEST(CalendarDataStorage, Delete_Two_Accounts){
+TEST_F(CalendarDataStorageTests, Delete_Two_Accounts){
        
        CalendarDataStorage deleteAccountTest;
        
@@ -334,7 +347,7 @@ TEST(CalendarDataStorage, Delete_Two_Accounts){
        
 }
 
-TEST(CalendarDataStorage, Delete_Three_Accounts){
+TEST_F(CalendarDataStorageTests, Delete_Three_Accounts){
        
        CalendarDataStorage deleteAccountTest;
        
@@ -348,7 +361,7 @@ TEST(CalendarDataStorage, Delete_Three_Accounts){
        
 }
 
-TEST(CalendarDataStorage, Delete_Account_That_Does_Not_Exist_Return_No_Account_Message){
+TEST_F(CalendarDataStorageTests, Delete_Account_That_Does_Not_Exist_Return_No_Account_Message){
 
        CalendarDataStorage deleteAccountTest;
        
@@ -356,7 +369,7 @@ TEST(CalendarDataStorage, Delete_Account_That_Does_Not_Exist_Return_No_Account_M
        
 }
 
-TEST(CalendarDataStorage, Add_One_Calendar_To_One_Account){
+TEST_F(CalendarDataStorageTests, Add_One_Calendar_To_One_Account){
        
        CalendarDataStorage addCalendarTest;
        
@@ -366,7 +379,7 @@ TEST(CalendarDataStorage, Add_One_Calendar_To_One_Account){
        
 }
 
-TEST(CalendarDataStorage, Add_Two_Calendars_To_One_Account){
+TEST_F(CalendarDataStorageTests, Add_Two_Calendars_To_One_Account){
        
        CalendarDataStorage addCalendarTest;
        
@@ -377,7 +390,7 @@ TEST(CalendarDataStorage, Add_Two_Calendars_To_One_Account){
        
 }
 
-TEST(CalendarDataStorage, Add_Three_Calendars_To_One_Account){
+TEST_F(CalendarDataStorageTests, Add_Three_Calendars_To_One_Account){
        
        CalendarDataStorage addCalendarTest;
        
@@ -389,7 +402,7 @@ TEST(CalendarDataStorage, Add_Three_Calendars_To_One_Account){
        
 }
 
-TEST(CalendarDataStorage, Add_Calendar_To_Account_That_Does_Not_Exist_Return_No_Account_Message){
+TEST_F(CalendarDataStorageTests, Add_Calendar_To_Account_That_Does_Not_Exist_Return_No_Account_Message){
 
        CalendarDataStorage addCalendarTest;
 
@@ -397,7 +410,7 @@ TEST(CalendarDataStorage, Add_Calendar_To_Account_That_Does_Not_Exist_Return_No_
        
 }
        
-TEST(CalendarDataStorage, Add_One_Calendar_To_Two_Accounts){
+TEST_F(CalendarDataStorageTests, Add_One_Calendar_To_Two_Accounts){
        
        CalendarDataStorage addCalendarTest;
        
@@ -410,7 +423,7 @@ TEST(CalendarDataStorage, Add_One_Calendar_To_Two_Accounts){
        
 }
 
-TEST(CalendarDataStorage, Add_Two_Calendars_To_Two_Accounts){
+TEST_F(CalendarDataStorageTests, Add_Two_Calendars_To_Two_Accounts){
        
        CalendarDataStorage addCalendarTest;
        
@@ -425,7 +438,7 @@ TEST(CalendarDataStorage, Add_Two_Calendars_To_Two_Accounts){
        
 }
 
-TEST(CalendarDataStorage, Add_Three_Calendars_To_Two_Accounts){
+TEST_F(CalendarDataStorageTests, Add_Three_Calendars_To_Two_Accounts){
        
        CalendarDataStorage addCalendarTest;
        
@@ -442,7 +455,7 @@ TEST(CalendarDataStorage, Add_Three_Calendars_To_Two_Accounts){
        
 }
 
-TEST(CalendarDataStorage, Add_One_Calendar_To_Three_Accounts){
+TEST_F(CalendarDataStorageTests, Add_One_Calendar_To_Three_Accounts){
        
        CalendarDataStorage addCalendarTest;
        
@@ -458,7 +471,7 @@ TEST(CalendarDataStorage, Add_One_Calendar_To_Three_Accounts){
        
 }
 
-TEST(CalendarDataStorage, Add_Two_Calendars_To_Three_Accounts){
+TEST_F(CalendarDataStorageTests, Add_Two_Calendars_To_Three_Accounts){
        
        CalendarDataStorage addCalendarTest;
        
@@ -477,7 +490,7 @@ TEST(CalendarDataStorage, Add_Two_Calendars_To_Three_Accounts){
        
 }
 
-TEST(CalendarDataStorage, Add_Three_Calendars_To_Three_Accounts){
+TEST_F(CalendarDataStorageTests, Add_Three_Calendars_To_Three_Accounts){
        
        CalendarDataStorage addCalendarTest;
        
@@ -499,7 +512,7 @@ TEST(CalendarDataStorage, Add_Three_Calendars_To_Three_Accounts){
        
 }
 
-TEST(CalendarDataStorage, Get_Calendar_Information_From_One_Account){
+TEST_F(CalendarDataStorageTests, Get_Calendar_Information_From_One_Account){
        
        CalendarDataStorage getCalendarTest;
        
@@ -551,7 +564,7 @@ TEST(CalendarDataStorage, Get_Calendar_Information_From_One_Account){
 
 }
 
-TEST(CalendarDataStorage, Get_Calendar_Information_From_Two_Accounts){
+TEST_F(CalendarDataStorageTests, Get_Calendar_Information_From_Two_Accounts){
        
        CalendarDataStorage getCalendarTest;
        
@@ -647,7 +660,7 @@ TEST(CalendarDataStorage, Get_Calendar_Information_From_Two_Accounts){
 
 }
 
-TEST(CalendarDataStorage, Get_Calendar_Information_From_Three_Accounts){
+TEST_F(CalendarDataStorageTests, Get_Calendar_Information_From_Three_Accounts){
        
        CalendarDataStorage getCalendarTest;
        
@@ -789,7 +802,7 @@ TEST(CalendarDataStorage, Get_Calendar_Information_From_Three_Accounts){
 
 }
 
-TEST(CalendarDataStorage, Update_One_Calendar_With_One_Account){
+TEST_F(CalendarDataStorageTests, Update_One_Calendar_With_One_Account){
        
        CalendarDataStorage updateCalendarTest;
        
@@ -805,7 +818,7 @@ TEST(CalendarDataStorage, Update_One_Calendar_With_One_Account){
        
 }
 
-TEST(CalendarDataStorage, Update_One_Calendar_With_Two_Accounts){
+TEST_F(CalendarDataStorageTests, Update_One_Calendar_With_Two_Accounts){
        
        CalendarDataStorage updateCalendarTest;
        
@@ -829,7 +842,7 @@ TEST(CalendarDataStorage, Update_One_Calendar_With_Two_Accounts){
        
 }
 
-TEST(CalendarDataStorage, Update_One_Calendar_With_Three_Accounts){
+TEST_F(CalendarDataStorageTests, Update_One_Calendar_With_Three_Accounts){
        
        CalendarDataStorage updateCalendarTest;
        
@@ -859,7 +872,7 @@ TEST(CalendarDataStorage, Update_One_Calendar_With_Three_Accounts){
        
 }
 
-TEST(CalendarDataStorage, Update_Two_Calendars_With_One_Account){
+TEST_F(CalendarDataStorageTests, Update_Two_Calendars_With_One_Account){
        
        CalendarDataStorage updateCalendarTest;
        
@@ -882,7 +895,7 @@ TEST(CalendarDataStorage, Update_Two_Calendars_With_One_Account){
        
 }
 
-TEST(CalendarDataStorage, Update_Two_Calendars_With_Two_Accounts){
+TEST_F(CalendarDataStorageTests, Update_Two_Calendars_With_Two_Accounts){
        
        CalendarDataStorage updateCalendarTest;
        
@@ -916,7 +929,7 @@ TEST(CalendarDataStorage, Update_Two_Calendars_With_Two_Accounts){
 
 }
 
-TEST(CalendarDataStorage, Update_Two_Calendars_With_Three_Accounts){
+TEST_F(CalendarDataStorageTests, Update_Two_Calendars_With_Three_Accounts){
        
        CalendarDataStorage updateCalendarTest;
        
@@ -962,7 +975,7 @@ TEST(CalendarDataStorage, Update_Two_Calendars_With_Three_Accounts){
 }
 
 
-TEST(CalendarDataStorage, Update_Three_Calendars_With_One_Account){
+TEST_F(CalendarDataStorageTests, Update_Three_Calendars_With_One_Account){
        
        CalendarDataStorage updateCalendarTest;
        
@@ -990,7 +1003,7 @@ TEST(CalendarDataStorage, Update_Three_Calendars_With_One_Account){
 
 }
 
-TEST(CalendarDataStorage, Update_Three_Calendars_With_Two_Accounts){
+TEST_F(CalendarDataStorageTests, Update_Three_Calendars_With_Two_Accounts){
        
        CalendarDataStorage updateCalendarTest;
        
@@ -1034,7 +1047,7 @@ TEST(CalendarDataStorage, Update_Three_Calendars_With_Two_Accounts){
 
 }
 
-TEST(CalendarDataStorage, Update_Three_Calendars_With_Three_Accounts){
+TEST_F(CalendarDataStorageTests, Update_Three_Calendars_With_Three_Accounts){
        
        CalendarDataStorage updateCalendarTest;
        
@@ -1094,7 +1107,7 @@ TEST(CalendarDataStorage, Update_Three_Calendars_With_Three_Accounts){
 
 }
 
-TEST(CalendarDataStorage, Delete_One_Calendar){
+TEST_F(CalendarDataStorageTests, Delete_One_Calendar){
        
        CalendarDataStorage deleteCalendarTest;
        int calendarID = 0;
@@ -1109,7 +1122,7 @@ TEST(CalendarDataStorage, Delete_One_Calendar){
        
 }
 
-TEST(CalendarDataStorage, Delete_Two_Calendars){
+TEST_F(CalendarDataStorageTests, Delete_Two_Calendars){
        
        CalendarDataStorage deleteCalendarTest;
        int calendarID1 = 0;
@@ -1129,7 +1142,7 @@ TEST(CalendarDataStorage, Delete_Two_Calendars){
        
 }
 
-TEST(CalendarDataStorage, Delete_Three_Calendars){
+TEST_F(CalendarDataStorageTests, Delete_Three_Calendars){
        
        CalendarDataStorage deleteCalendarTest;
        int calendarID1 = 0;
@@ -1154,7 +1167,7 @@ TEST(CalendarDataStorage, Delete_Three_Calendars){
        
 }
 
-TEST(CalendarDataStorage, Add_One_Event){
+TEST_F(CalendarDataStorageTests, Add_One_Event){
        
        CalendarDataStorage addEventTest;
        
@@ -1168,7 +1181,7 @@ TEST(CalendarDataStorage, Add_One_Event){
        
 }
 
-TEST(CalendarDataStorage, Add_Two_Events){
+TEST_F(CalendarDataStorageTests, Add_Two_Events){
        
        CalendarDataStorage addEventTest;
        
@@ -1187,7 +1200,7 @@ TEST(CalendarDataStorage, Add_Two_Events){
        
 }
 
-TEST(CalendarDataStorage, Add_Three_Events){
+TEST_F(CalendarDataStorageTests, Add_Three_Events){
        
        CalendarDataStorage addEventTest;
        
@@ -1211,7 +1224,7 @@ TEST(CalendarDataStorage, Add_Three_Events){
        
 }
 
-TEST(CalendarDataStorage, Add_One_Event_And_Get_Event_Basic_Information){
+TEST_F(CalendarDataStorageTests, Add_One_Event_And_Get_Event_Basic_Information){
        
        CalendarDataStorage addEventTest;       
 
@@ -1241,7 +1254,7 @@ TEST(CalendarDataStorage, Add_One_Event_And_Get_Event_Basic_Information){
 
 }
 
-TEST(CalendarDataStorage, Add_One_Event_And_Get_Event_Basic_Information_With_Duration){
+TEST_F(CalendarDataStorageTests, Add_One_Event_And_Get_Event_Basic_Information_With_Duration){
        
        CalendarDataStorage addEventTest;       
 
@@ -1278,7 +1291,7 @@ TEST(CalendarDataStorage, Add_One_Event_And_Get_Event_Basic_Information_With_Dur
 
 }
 
-TEST(CalendarDataStorage, Add_Two_Events_And_Get_Event_Basic_Information){
+TEST_F(CalendarDataStorageTests, Add_Two_Events_And_Get_Event_Basic_Information){
        
        CalendarDataStorage addEventTest;       
 
@@ -1334,7 +1347,7 @@ TEST(CalendarDataStorage, Add_Two_Events_And_Get_Event_Basic_Information){
        
 }
 
-TEST(CalendarDataStorage, Add_The_Same_Three_Events_And_Get_Event_Information){
+TEST_F(CalendarDataStorageTests, Add_The_Same_Three_Events_And_Get_Event_Information){
        
        CalendarDataStorage addEventTest;
 
@@ -1405,7 +1418,7 @@ TEST(CalendarDataStorage, Add_The_Same_Three_Events_And_Get_Event_Information){
        
 }
 
-TEST(CalendarDataStorage, Add_Three_Events_And_Get_Event_Information){
+TEST_F(CalendarDataStorageTests, Add_Three_Events_And_Get_Event_Information){
        
        CalendarDataStorage addEventTest;
 
@@ -1481,7 +1494,7 @@ TEST(CalendarDataStorage, Add_Three_Events_And_Get_Event_Information){
        
 }
 
-TEST(CalendarDataStorage, Delete_One_Event){
+TEST_F(CalendarDataStorageTests, Delete_One_Event){
        
        CalendarDataStorage deleteEventTest;
 
@@ -1495,7 +1508,7 @@ TEST(CalendarDataStorage, Delete_One_Event){
        
 }
 
-TEST(CalendarDataStorage, Delete_Two_Events){
+TEST_F(CalendarDataStorageTests, Delete_Two_Events){
        
        CalendarDataStorage deleteEventTest;
 
@@ -1512,7 +1525,7 @@ TEST(CalendarDataStorage, Delete_Two_Events){
        
 }
 
-TEST(CalendarDataStorage, Delete_Three_Events){
+TEST_F(CalendarDataStorageTests, Delete_Three_Events){
        
        CalendarDataStorage deleteEventTest;
 
@@ -1532,7 +1545,7 @@ TEST(CalendarDataStorage, Delete_Three_Events){
        
 }
 
-TEST(CalendarDataStorage, Delete_One_Calendar_And_Events){
+TEST_F(CalendarDataStorageTests, Delete_One_Calendar_And_Events){
 
        CalendarDataStorage deleteEventTest;
        
@@ -1550,7 +1563,7 @@ TEST(CalendarDataStorage, Delete_One_Calendar_And_Events){
        
 }
 
-TEST(CalendarDataStorage, Delete_Two_Calendars_And_Events){
+TEST_F(CalendarDataStorageTests, Delete_Two_Calendars_And_Events){
 
        CalendarDataStorage deleteEventTest;
        
@@ -1584,7 +1597,7 @@ TEST(CalendarDataStorage, Delete_Two_Calendars_And_Events){
        
 }
 
-TEST(CalendarDataStorage, Delete_Three_Calendars_And_Events){
+TEST_F(CalendarDataStorageTests, Delete_Three_Calendars_And_Events){
 
        CalendarDataStorage deleteEventTest;
        
@@ -1631,7 +1644,7 @@ TEST(CalendarDataStorage, Delete_Three_Calendars_And_Events){
        
 }
 
-TEST(CalendarDataStorage, Delete_One_Account_And_Associated_Data){
+TEST_F(CalendarDataStorageTests, Delete_One_Account_And_Associated_Data){
        
        CalendarDataStorage deleteAccountTest;
        
@@ -1655,7 +1668,7 @@ TEST(CalendarDataStorage, Delete_One_Account_And_Associated_Data){
        
 }
 
-TEST(CalendarDataStorage, Delete_Two_Accounts_And_Associated_Data){
+TEST_F(CalendarDataStorageTests, Delete_Two_Accounts_And_Associated_Data){
        
        CalendarDataStorage deleteAccountTest;
        
@@ -1703,7 +1716,7 @@ TEST(CalendarDataStorage, Delete_Two_Accounts_And_Associated_Data){
 
 }
 
-TEST(CalendarDataStorage, Delete_Three_Accounts_And_Associated_Data){
+TEST_F(CalendarDataStorageTests, Delete_Three_Accounts_And_Associated_Data){
        
        CalendarDataStorage deleteAccountTest;
        
@@ -1770,7 +1783,7 @@ TEST(CalendarDataStorage, Delete_Three_Accounts_And_Associated_Data){
 
 }
 
-TEST(CalendarDataStorage, Get_List_Of_Events_For_One_Account){
+TEST_F(CalendarDataStorageTests, Get_List_Of_Events_For_One_Account){
 
        CalendarDataStorage getEventsListTest;
        
@@ -1794,7 +1807,7 @@ TEST(CalendarDataStorage, Get_List_Of_Events_For_One_Account){
        
 }
 
-TEST(CalendarDataStorage, Get_List_Of_Events_For_Two_Accounts){
+TEST_F(CalendarDataStorageTests, Get_List_Of_Events_For_Two_Accounts){
 
        CalendarDataStorage getEventsListTest;
        
@@ -1832,7 +1845,7 @@ TEST(CalendarDataStorage, Get_List_Of_Events_For_Two_Accounts){
        
 }
 
-TEST(CalendarDataStorage, Get_List_Of_Events_For_Three_Accounts){
+TEST_F(CalendarDataStorageTests, Get_List_Of_Events_For_Three_Accounts){
 
        CalendarDataStorage getEventsListTest;
        
@@ -1882,7 +1895,7 @@ TEST(CalendarDataStorage, Get_List_Of_Events_For_Three_Accounts){
 
 }
 
-TEST(CalendarDataStorage, Get_List_Of_Calendars_For_One_Account){
+TEST_F(CalendarDataStorageTests, Get_List_Of_Calendars_For_One_Account){
        
        CalendarDataStorage getEventsListTest;
        
@@ -1908,7 +1921,7 @@ TEST(CalendarDataStorage, Get_List_Of_Calendars_For_One_Account){
        
 }
 
-TEST(CalendarDataStorage, Get_List_Of_Calendars_For_Two_Accounts){
+TEST_F(CalendarDataStorageTests, Get_List_Of_Calendars_For_Two_Accounts){
        
        CalendarDataStorage getEventsListTest;
        
@@ -1951,7 +1964,7 @@ TEST(CalendarDataStorage, Get_List_Of_Calendars_For_Two_Accounts){
 
 }
 
-TEST(CalendarDataStorage, Get_List_Of_Calendars_For_Three_Accounts){
+TEST_F(CalendarDataStorageTests, Get_List_Of_Calendars_For_Three_Accounts){
        
        CalendarDataStorage getEventsListTest;
        
@@ -2011,7 +2024,7 @@ TEST(CalendarDataStorage, Get_List_Of_Calendars_For_Three_Accounts){
 
 }
 
-TEST(CalendarDataStorage, Add_One_Checksum){
+TEST_F(CalendarDataStorageTests, Add_One_Checksum){
        
        CalendarDataStorage checksumTest;
        
@@ -2023,7 +2036,7 @@ TEST(CalendarDataStorage, Add_One_Checksum){
        
 }
 
-TEST(CalendarDataStorage, Add_Two_Checksus){
+TEST_F(CalendarDataStorageTests, Add_Two_Checksus){
        
        CalendarDataStorage checksumTest;
        
@@ -2032,7 +2045,7 @@ TEST(CalendarDataStorage, Add_Two_Checksus){
        
 }
 
-TEST(CalendarDataStorage, Add_Three_Checksus){
+TEST_F(CalendarDataStorageTests, Add_Three_Checksus){
        
        CalendarDataStorage checksumTest;
        
@@ -2042,7 +2055,7 @@ TEST(CalendarDataStorage, Add_Three_Checksus){
        
 }
 
-TEST(CalendarDataStorage, Add_One_Checksum_And_Get_One_Checksum){
+TEST_F(CalendarDataStorageTests, Add_One_Checksum_And_Get_One_Checksum){
        
        CalendarDataStorage checksumTest;
        
@@ -2057,7 +2070,7 @@ TEST(CalendarDataStorage, Add_One_Checksum_And_Get_One_Checksum){
        
 }
 
-TEST(CalendarDataStorage, Add_Two_Checksums_And_Get_Two_Checksums){
+TEST_F(CalendarDataStorageTests, Add_Two_Checksums_And_Get_Two_Checksums){
        
        CalendarDataStorage checksumTest;
        
@@ -2078,7 +2091,7 @@ TEST(CalendarDataStorage, Add_Two_Checksums_And_Get_Two_Checksums){
        
 }
 
-TEST(CalendarDataStorage, Add_Three_Checksums_And_Get_Three_Checksums){
+TEST_F(CalendarDataStorageTests, Add_Three_Checksums_And_Get_Three_Checksums){
        
        CalendarDataStorage checksumTest;
        
@@ -2105,7 +2118,7 @@ TEST(CalendarDataStorage, Add_Three_Checksums_And_Get_Three_Checksums){
        
 }
 
-TEST(CalendarDataStorage, Add_One_Checksum_Update_One_Checksum_And_Get_One_Checksum){
+TEST_F(CalendarDataStorageTests, Add_One_Checksum_Update_One_Checksum_And_Get_One_Checksum){
        
        CalendarDataStorage checksumTest;
        
@@ -2131,7 +2144,7 @@ TEST(CalendarDataStorage, Add_One_Checksum_Update_One_Checksum_And_Get_One_Check
        
 }
 
-TEST(CalendarDataStorage, Add_Two_Checksums_Update_Two_Checksums_And_Get_Two_Checksums){
+TEST_F(CalendarDataStorageTests, Add_Two_Checksums_Update_Two_Checksums_And_Get_Two_Checksums){
        
        CalendarDataStorage checksumTest;
        
@@ -2169,7 +2182,7 @@ TEST(CalendarDataStorage, Add_Two_Checksums_Update_Two_Checksums_And_Get_Two_Che
        
 }
 
-TEST(CalendarDataStorage, Add_Three_Checksums_Update_Three_Checksums_And_Get_Three_Checksums){
+TEST_F(CalendarDataStorageTests, Add_Three_Checksums_Update_Three_Checksums_And_Get_Three_Checksums){
        
        CalendarDataStorage checksumTest;