X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;ds=inline;f=source%2Ftests%2Fxestiacalendar_test.cpp;h=198a2323d78e37ab1d71fd4b2c1dd1b25678db2e;hb=8916c05c5281bf0c97419df6e7ce6d641c56fb3e;hp=c8aad78c897c9fdf5cfb5c692bc4a357ee076385;hpb=61e8f6beb6ea2936c4cc4d3cbb657989b609e98c;p=xestiacalendar%2F.git
diff --git a/source/tests/xestiacalendar_test.cpp b/source/tests/xestiacalendar_test.cpp
index c8aad78..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
@@ -25,6 +26,9 @@
#include "xestiacalendar_commonfunctions.h"
#include "xestiacalendar_icaltaskload.h"
#include "xestiacalendar_icaljournalload.h"
+#include "xestiacalendar_icalfreebusyload.h"
+#include "xestiacalendar_icaltimezoneload.h"
+#include "xestiacalendar_caldav.h"
enum MenuOpts {
TESTS_ICALLOADEVENT = 1,
@@ -32,7 +36,7 @@ enum MenuOpts {
TESTS_ICALLOADJOURNAL,
TESTS_ICALLOADFREEBUSY,
TESTS_ICALLOADTIMEZONE,
- TESTS_ICALLOADALARM,
+ TESTS_CALDAV,
TESTS_COMMONFUNCTIONS,
TESTS_QUIT
};
@@ -51,6 +55,9 @@ void printmenu(){
std::cout << TESTS_ICALLOADEVENT << ". iCalendar Event Component Load" << std::endl;
std::cout << TESTS_ICALLOADTODO << ". iCalendar Task Component Load" << std::endl;
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_CALDAV << ". CalDAV Object" << std::endl;
std::cout << TESTS_COMMONFUNCTIONS << ". Common Functions" << std::endl;
std::cout << TESTS_QUIT << ". Quit" << std::endl;
std::cout << std::endl;
@@ -59,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");
@@ -112,7 +123,22 @@ int main(int argc, char* argv[]){
break;
case TESTS_ICALLOADJOURNAL:
printn("Running iCalendar Journal Component tests...");
- ::testing::GTEST_FLAG(filter) = "iCalendarTask*";
+ ::testing::GTEST_FLAG(filter) = "iCalendarJournal*";
+ TestResult = RUN_ALL_TESTS();
+ break;
+ case TESTS_ICALLOADFREEBUSY:
+ printn("Running iCalendar Free Busy Component tests...");
+ ::testing::GTEST_FLAG(filter) = "iCalendarFreeBusy*";
+ TestResult = RUN_ALL_TESTS();
+ break;
+ case TESTS_ICALLOADTIMEZONE:
+ printn("Running iCalendar Free Busy Component tests...");
+ ::testing::GTEST_FLAG(filter) = "iCalendarTimezone*";
+ TestResult = RUN_ALL_TESTS();
+ break;
+ case TESTS_CALDAV:
+ printn("Running CalDAV tests...");
+ ::testing::GTEST_FLAG(filter) = "CalDAV*";
TestResult = RUN_ALL_TESTS();
break;
case TESTS_COMMONFUNCTIONS:
@@ -120,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;