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

diff --git a/source/tests/xestiaab_test.cpp b/source/tests/xestiaab_test.cpp
index f1a77f8..7dc8491 100644
--- a/source/tests/xestiaab_test.cpp
+++ b/source/tests/xestiaab_test.cpp
@@ -19,16 +19,19 @@
 #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
 };
@@ -48,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;
@@ -112,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) = "*";