X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Ftests%2Fxestiacalendar_test.cpp;h=06c8f7c7b65f309c83fe041f92e4034f0efe0e7d;hb=00dff59febad28b9588ceca2aa8cde1d0438971f;hp=c8aad78c897c9fdf5cfb5c692bc4a357ee076385;hpb=61e8f6beb6ea2936c4cc4d3cbb657989b609e98c;p=xestiacalendar%2F.git

diff --git a/source/tests/xestiacalendar_test.cpp b/source/tests/xestiacalendar_test.cpp
index c8aad78..06c8f7c 100644
--- a/source/tests/xestiacalendar_test.cpp
+++ b/source/tests/xestiacalendar_test.cpp
@@ -25,6 +25,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 +35,7 @@ enum MenuOpts {
 	TESTS_ICALLOADJOURNAL,
 	TESTS_ICALLOADFREEBUSY,
 	TESTS_ICALLOADTIMEZONE,
-	TESTS_ICALLOADALARM,
+	TESTS_CALDAV,
 	TESTS_COMMONFUNCTIONS,
 	TESTS_QUIT
 };
@@ -51,6 +54,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;
@@ -112,7 +118,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 +141,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;