X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Ftests%2Fxestiaab_contactload.h;h=3d12c8d79e1338d7498b83c43ce1154dadff724d;hb=0a415669d5de48a0014a01488060d895da00c6c2;hp=07160e05537e2bf4ff36b0aff6254bd25a13cf2e;hpb=17d33f5a39d1b64be75d308a78467290e96b7e38;p=xestiaab%2F.git

diff --git a/source/tests/xestiaab_contactload.h b/source/tests/xestiaab_contactload.h
index 07160e0..3d12c8d 100644
--- a/source/tests/xestiaab_contactload.h
+++ b/source/tests/xestiaab_contactload.h
@@ -17,7 +17,7 @@
 // with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
 
 #include <gtest/gtest.h>
-#include "../contacteditor/ContactDataObject.h"
+#include "../contacteditor/cdo/ContactDataObject.h"
 
 TEST(ContactLoad, ContactLoadTests){
 
@@ -169,6 +169,44 @@ TEST(ContactLoad, UIDTest){
 
 }
 
+TEST(ContactLoad, ClientPIDMapTests){
+
+	ContactDataObject TestFile;
+
+	ASSERT_EQ(CONTACTLOAD_OK, TestFile.LoadFile("LoadCheck-Load4.vcf"));
+
+	std::map<int,wxString>::iterator TestFileIter;
+
+	// Test the first Client PID Map.
+
+	TestFileIter = TestFile.ClientPIDList.find(0);
+	ASSERT_NE(TestFile.ClientPIDList.end(), TestFileIter);
+	ASSERT_EQ("1;urn;uuid:aaaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", TestFileIter->second);	
+
+	TestFileIter = TestFile.ClientPIDListTokens.find(0);
+	ASSERT_EQ(TestFile.ClientPIDListTokens.end(), TestFileIter);
+
+	// Test the second Client PID Map.
+
+	TestFileIter = TestFile.ClientPIDList.find(1);
+	ASSERT_NE(TestFile.ClientPIDList.end(), TestFileIter);
+	ASSERT_EQ("2;urn;uuid:ccccccccc-cccc-cccc-cccc-cccccccccccc", TestFileIter->second);
+
+	TestFileIter = TestFile.ClientPIDListTokens.find(1);
+	ASSERT_EQ(TestFile.ClientPIDListTokens.end(), TestFileIter);
+	
+	// Test the third Client PID Map.
+	
+	TestFileIter = TestFile.ClientPIDListTokens.find(2);
+	ASSERT_NE(TestFile.ClientPIDListTokens.end(), TestFileIter);
+	ASSERT_EQ("MEEP=MOO;WOOP=WOO", TestFileIter->second);
+
+	TestFileIter = TestFile.ClientPIDList.find(2);
+	ASSERT_NE(TestFile.ClientPIDList.end(), TestFileIter);
+	ASSERT_EQ("3;urn;uuid:bbbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb", TestFileIter->second);
+
+}
+
 TEST(ContactLoad, RevisionTests){
 
 	ContactDataObject TestFile;
@@ -1199,13 +1237,19 @@ TEST(ContactLoad, TelephoneTests){
 	
 	TestFileIter = TestFile.GeneralTelephoneList.find(0);
 	ASSERT_NE(TestFile.GeneralTelephoneList.end(), TestFileIter);
-	ASSERT_EQ("tel:00000000", TestFileIter->second);
+	ASSERT_EQ("00000000", TestFileIter->second);
+	
+	// Check the data type section.
+
+	TestFileIter = TestFile.GeneralTelephoneListDataType.find(0);
+	ASSERT_NE(TestFile.GeneralTelephoneListDataType.end(), TestFileIter);
+	ASSERT_EQ("tel", TestFileIter->second);	
 	
 	// Check the type section.
 	
 	TestFileIter = TestFile.GeneralTelephoneListTypeInfo.find(0);
 	ASSERT_NE(TestFile.GeneralTelephoneListTypeInfo.end(), TestFileIter);
-	ASSERT_EQ("fax,mobile", TestFileIter->second);	
+	ASSERT_EQ("fax,cell", TestFileIter->second.ToStdString());	
 	
 	// Check the ALTID section.
 	
@@ -1235,7 +1279,13 @@ TEST(ContactLoad, TelephoneTests){
 	
 	TestFileIter = TestFile.HomeTelephoneList.find(1);
 	ASSERT_NE(TestFile.HomeTelephoneList.end(), TestFileIter);
-	ASSERT_EQ("tel:00001111", TestFileIter->second);
+	ASSERT_EQ("00001111", TestFileIter->second);
+	
+	// Check the data type section.
+
+	TestFileIter = TestFile.HomeTelephoneListDataType.find(1);
+	ASSERT_NE(TestFile.HomeTelephoneListDataType.end(), TestFileIter);
+	ASSERT_EQ("tel", TestFileIter->second);	
 	
 	// Check the type section.
 	
@@ -1271,7 +1321,13 @@ TEST(ContactLoad, TelephoneTests){
 	
 	TestFileIter = TestFile.BusinessTelephoneList.find(2);
 	ASSERT_NE(TestFile.BusinessTelephoneList.end(), TestFileIter);
-	ASSERT_EQ("tel:22221111", TestFileIter->second);
+	ASSERT_EQ("22221111", TestFileIter->second);
+	
+	// Check the data type section.
+
+	TestFileIter = TestFile.BusinessTelephoneListDataType.find(2);
+	ASSERT_NE(TestFile.BusinessTelephoneListDataType.end(), TestFileIter);
+	ASSERT_EQ("tel", TestFileIter->second);
 	
 	// Check the type section.
 	
@@ -2540,6 +2596,11 @@ TEST(ContactLoad, PhotoTests){
 	ASSERT_NE(TestFile.PicturesListPID.end(), TestFileIter);
 	ASSERT_EQ("71", TestFileIter->second);
 	
+	// Check the TYPE section.
+	
+	TestFileIter = TestFile.PicturesListType.find(0);
+	ASSERT_EQ(TestFile.PicturesListType.end(), TestFileIter);
+	
 	// Check the MEDIATYPE section.
 	
 	TestFileIter = TestFile.PicturesListMediatype.find(0);
@@ -2589,6 +2650,12 @@ TEST(ContactLoad, PhotoTests){
 	ASSERT_NE(TestFile.PicturesListPID.end(), TestFileIter);
 	ASSERT_EQ("21", TestFileIter->second);
 	
+	// Check the TYPE section.
+	
+	TestFileIter = TestFile.PicturesListType.find(1);
+	ASSERT_NE(TestFile.PicturesListType.end(), TestFileIter);
+	ASSERT_EQ("home", TestFileIter->second);
+	
 	// Check the MEDIATYPE section.
 	
 	TestFileIter = TestFile.PicturesListMediatype.find(1);
@@ -2638,6 +2705,12 @@ TEST(ContactLoad, PhotoTests){
 	ASSERT_NE(TestFile.PicturesListPID.end(), TestFileIter);
 	ASSERT_EQ("91", TestFileIter->second);
 	
+	// Check the TYPE section.
+	
+	TestFileIter = TestFile.PicturesListType.find(2);
+	ASSERT_NE(TestFile.PicturesListType.end(), TestFileIter);
+	ASSERT_EQ("work", TestFileIter->second);
+	
 	// Check the MEDIATYPE section.
 	
 	TestFileIter = TestFile.PicturesListMediatype.find(2);
@@ -2701,6 +2774,8 @@ TEST(ContactLoad, LogoTests){
 	ASSERT_NE(TestFile.LogosListPID.end(), TestFileIter);
 	ASSERT_EQ("71", TestFileIter->second);
 	
+	// Check the TYPE section.
+		
 	// Check the MEDIATYPE section.
 	
 	TestFileIter = TestFile.LogosListMediatype.find(0);
@@ -2749,6 +2824,12 @@ TEST(ContactLoad, LogoTests){
 	TestFileIter = TestFile.LogosListPID.find(1);
 	ASSERT_NE(TestFile.LogosListPID.end(), TestFileIter);
 	ASSERT_EQ("21", TestFileIter->second);
+
+	// Check the TYPE section.
+	
+	TestFileIter = TestFile.LogosListType.find(1);
+	ASSERT_NE(TestFile.LogosListType.end(), TestFileIter);
+	ASSERT_EQ("home", TestFileIter->second);
 	
 	// Check the MEDIATYPE section.
 	
@@ -2799,6 +2880,12 @@ TEST(ContactLoad, LogoTests){
 	ASSERT_NE(TestFile.LogosListPID.end(), TestFileIter);
 	ASSERT_EQ("91", TestFileIter->second);
 	
+	// Check the TYPE section.
+	
+	TestFileIter = TestFile.LogosListType.find(2);
+	ASSERT_NE(TestFile.LogosListType.end(), TestFileIter);
+	ASSERT_EQ("work", TestFileIter->second);
+	
 	// Check the MEDIATYPE section.
 	
 	TestFileIter = TestFile.LogosListMediatype.find(2);
@@ -4229,6 +4316,4 @@ TEST(ContactLoad, XTokenTest){
 	ASSERT_NE(TestFile.XTokenListTokens.end(), TestFileIter);
 	ASSERT_EQ("FOODS;STATUS=FAVOURITE;TYPE=CHEESEANDONION", TestFileIter->second.ToStdString());
 
-}
-
-// TODO: Add tests for the Contact Loading process.
\ No newline at end of file
+}
\ No newline at end of file