X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Ftests%2Fxestiacalendar_test.cpp;h=198a2323d78e37ab1d71fd4b2c1dd1b25678db2e;hb=19736989bf2de4c5007659958373445ab40b0956;hp=c7900e11bacb743bede81dd11489b5a95310f933;hpb=d4259838e77ab89572be3edf27cc3d0ab557761d;p=xestiacalendar%2F.git diff --git a/source/tests/xestiacalendar_test.cpp b/source/tests/xestiacalendar_test.cpp index c7900e1..198a232 100644 --- a/source/tests/xestiacalendar_test.cpp +++ b/source/tests/xestiacalendar_test.cpp @@ -16,6 +16,7 @@ // You should have received a copy of the GNU General Public License along // with Xestia Calendar. If not, see +#include #include #include #include @@ -27,7 +28,7 @@ #include "xestiacalendar_icaljournalload.h" #include "xestiacalendar_icalfreebusyload.h" #include "xestiacalendar_icaltimezoneload.h" -#include "xestiacalendar_icalalarmload.h" +#include "xestiacalendar_caldav.h" enum MenuOpts { TESTS_ICALLOADEVENT = 1, @@ -35,7 +36,7 @@ enum MenuOpts { TESTS_ICALLOADJOURNAL, TESTS_ICALLOADFREEBUSY, TESTS_ICALLOADTIMEZONE, - TESTS_ICALLOADALARM, + TESTS_CALDAV, TESTS_COMMONFUNCTIONS, TESTS_QUIT }; @@ -56,7 +57,7 @@ void printmenu(){ std::cout << TESTS_ICALLOADJOURNAL << ". iCalendar Journal Component Load" << std::endl; std::cout << TESTS_ICALLOADFREEBUSY << ". iCalendar FreeBusy Component Load" << std::endl; std::cout << TESTS_ICALLOADTIMEZONE << ". iCalendar Timezone Component Load" << std::endl; - std::cout << TESTS_ICALLOADALARM << ". iCalendar Alarm Component Load" << std::endl; + std::cout << TESTS_CALDAV << ". CalDAV Object" << std::endl; std::cout << TESTS_COMMONFUNCTIONS << ". Common Functions" << std::endl; std::cout << TESTS_QUIT << ". Quit" << std::endl; std::cout << std::endl; @@ -65,8 +66,12 @@ void printmenu(){ int main(int argc, char* argv[]){ + // Initialise the several libraries that have + // been included. + ::testing::InitGoogleTest(&argc, argv); - + curl_global_init(CURL_GLOBAL_ALL); + printn("Xestia Calendar Unit Testing Application"); printn("(c)2016 Xestia Software Development"); printn("Note: Unit testing is currently in development"); @@ -131,9 +136,9 @@ int main(int argc, char* argv[]){ ::testing::GTEST_FLAG(filter) = "iCalendarTimezone*"; TestResult = RUN_ALL_TESTS(); break; - case TESTS_ICALLOADALARM: - printn("Running iCalendar Alarm Component tests..."); - ::testing::GTEST_FLAG(filter) = "iCalendarAlarm*"; + case TESTS_CALDAV: + printn("Running CalDAV tests..."); + ::testing::GTEST_FLAG(filter) = "CalDAV*"; TestResult = RUN_ALL_TESTS(); break; case TESTS_COMMONFUNCTIONS: @@ -141,11 +146,6 @@ int main(int argc, char* argv[]){ ::testing::GTEST_FLAG(filter) = "CommonFunctions*"; TestResult = RUN_ALL_TESTS(); break; - /*case TESTS_CARDDAV: - printn("Running CardDAV tests..."); - ::testing::GTEST_FLAG(filter) = "CardDAV*"; - TestResult = RUN_ALL_TESTS(); - break;*/ case TESTS_QUIT: return 0; break;