X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Ftests%2Fxestiacalendar_test.cpp;h=198a2323d78e37ab1d71fd4b2c1dd1b25678db2e;hb=445c53e2570f9a38b54f7741d637ad9998bd7a56;hp=9c076a05b851ed78293fe3e1b79fc81a7a031273;hpb=01641b14340fbda38a9f07f528e38c33e48188ca;p=xestiacalendar%2F.git

diff --git a/source/tests/xestiacalendar_test.cpp b/source/tests/xestiacalendar_test.cpp
index 9c076a0..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 <http://www.gnu.org/licenses/>
 
+#include <curl/curl.h>
 #include <gtest/gtest.h>
 #include <iostream>
 #include <string>
@@ -26,6 +27,8 @@
 #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,
@@ -33,7 +36,7 @@ enum MenuOpts {
 	TESTS_ICALLOADJOURNAL,
 	TESTS_ICALLOADFREEBUSY,
 	TESTS_ICALLOADTIMEZONE,
-	TESTS_ICALLOADALARM,
+	TESTS_CALDAV,
 	TESTS_COMMONFUNCTIONS,
 	TESTS_QUIT
 };
@@ -53,6 +56,8 @@ void printmenu(){
 	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;
@@ -61,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");
@@ -122,16 +131,21 @@ int main(int argc, char* argv[]){
 				::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:
 				printn("Running Commmon Functions tests...");
 				::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;