X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Ftests%2Fxestiaab_test.cpp;h=7dc8491a1905f86e19d8d07ad85ae5f54383046a;hb=f69e09d827e06435ea94bb73aa71ab5f9d5c035b;hp=113e38048e09915a3c70a5a80200bd94adffd094;hpb=e7eaa503e46395e1126c901b1ff0d25388259ba5;p=xestiaab%2F.git

diff --git a/source/tests/xestiaab_test.cpp b/source/tests/xestiaab_test.cpp
index 113e380..7dc8491 100644
--- a/source/tests/xestiaab_test.cpp
+++ b/source/tests/xestiaab_test.cpp
@@ -1,16 +1,37 @@
+// xestiaab_test.cpp - Xestia Address Book Unit Testing Suite.
+//
+// (c) 2012-2015 Xestia Software Development.
+//
+// This file is part of Xestia Address Book.
+//
+// Xestia Address Book is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by the
+// Free Software Foundation, version 3 of the license.
+//
+// Xestia Address Book is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
+
 #include <gtest/gtest.h>
 #include <iostream>
 #include <string>
-#include "xestiaab_carddav.h"
 #include "xestiaab_contactload.h"
 #include "xestiaab_contactsave.h"
+#include "xestiaab_convert.h"
 #include "xestiaab_vcard.h"
+#include "xestiaab_common.h"
 
 enum MenuOpts {
 	TESTS_CARDDAV = 1, 
 	TESTS_CONTACTLOAD,
 	TESTS_CONTACTSAVE, 
 	TESTS_VCARD,
+	TESTS_CONVERT,
+	TESTS_COMMON,
 	TESTS_ALL,
 	TESTS_QUIT
 };
@@ -30,6 +51,8 @@ void printmenu(){
 	std::cout << TESTS_CONTACTLOAD << ". Contact Loading" << std::endl;
 	std::cout << TESTS_CONTACTSAVE << ". Contact Saving" << std::endl;
 	std::cout << TESTS_VCARD << ". vCard Object" << std::endl;
+	std::cout << TESTS_CONVERT << ". Contact Conversion" << std::endl;
+	std::cout << TESTS_COMMON << ". Common Functions" << std::endl;
 	std::cout << TESTS_ALL << ". All Tests" << std::endl;
 	std::cout << TESTS_QUIT << ". Quit" << std::endl;
 	std::cout << std::endl;
@@ -42,7 +65,7 @@ int main(int argc, char* argv[]){
 
 	printn("Xestia Address Book Unit Testing Application");
 	printn("(c)2015 Xestia Software Development");
-	
+	printn("Note: Unit testing is currently in development");
 	printn("");
 
 	bool ExitEnabled = false;
@@ -94,11 +117,21 @@ int main(int argc, char* argv[]){
 				::testing::GTEST_FLAG(filter) = "ContactSave*";
 				TestResult = RUN_ALL_TESTS();
 				break;
+			case TESTS_CONVERT:
+				printn("Running Contact Conversion tests...");
+				::testing::GTEST_FLAG(filter) = "ConvertCmdLine*";
+				TestResult = RUN_ALL_TESTS();
+				break;
 			case TESTS_VCARD:
 				printn("Running vCard tests...");
 				::testing::GTEST_FLAG(filter) = "vCard*";
 				TestResult = RUN_ALL_TESTS();
 				break;
+			case TESTS_COMMON:
+				printn("Running Common Functions tests...");
+				::testing::GTEST_FLAG(filter) = "CommonFunctions*";
+				TestResult = RUN_ALL_TESTS();
+				break;
 			case TESTS_ALL:
 				printn("Running all tests...");
 				::testing::GTEST_FLAG(filter) = "*";
@@ -115,4 +148,4 @@ int main(int argc, char* argv[]){
 	
 	}
 
-}
\ No newline at end of file
+}