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

diff --git a/source/tests/xestiacalendar_test.cpp b/source/tests/xestiacalendar_test.cpp
index c8aad78..f1ef691 100644
--- a/source/tests/xestiacalendar_test.cpp
+++ b/source/tests/xestiacalendar_test.cpp
@@ -25,6 +25,8 @@
 #include "xestiacalendar_commonfunctions.h"
 #include "xestiacalendar_icaltaskload.h"
 #include "xestiacalendar_icaljournalload.h"
+#include "xestiacalendar_icalfreebusyload.h"
+#include "xestiacalendar_icaltimezoneload.h"
 
 enum MenuOpts {
 	TESTS_ICALLOADEVENT = 1,
@@ -32,7 +34,6 @@ enum MenuOpts {
 	TESTS_ICALLOADJOURNAL,
 	TESTS_ICALLOADFREEBUSY,
 	TESTS_ICALLOADTIMEZONE,
-	TESTS_ICALLOADALARM,
 	TESTS_COMMONFUNCTIONS,
 	TESTS_QUIT
 };
@@ -51,6 +52,8 @@ 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_COMMONFUNCTIONS << ". Common Functions" << std::endl;
 	std::cout << TESTS_QUIT << ". Quit" << std::endl;
 	std::cout << std::endl;
@@ -112,7 +115,17 @@ 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_COMMONFUNCTIONS: