X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Ftests%2Fxestiaab_contactload.h;h=66e548ed6c32f70eed69ae29b7a65257ca7f267e;hb=072925fb1ad8123b6739fdfdaaf490bc8611f381;hp=bc220087fa636f46ce56f03f982714f458578360;hpb=b9886d22768b3d67c03c3ae1c5152be92fdf1c89;p=xestiaab%2F.git

diff --git a/source/tests/xestiaab_contactload.h b/source/tests/xestiaab_contactload.h
index bc22008..66e548e 100644
--- a/source/tests/xestiaab_contactload.h
+++ b/source/tests/xestiaab_contactload.h
@@ -2220,64 +2220,410 @@ TEST(ContactLoad, CategoryTests){
 
 	// Check the TYPE section.
 	
-	/*TestFileIter = TestFile.CategoriesListType.find(1);
+	TestFileIter = TestFile.CategoriesListType.find(3);
 	ASSERT_NE(TestFile.CategoriesListType.end(), TestFileIter);
-	ASSERT_EQ("home", TestFileIter->second);
+	ASSERT_EQ("work", TestFileIter->second);
 
-	TestFileIter = TestFile.CategoriesListType.find(2);
+	TestFileIter = TestFile.CategoriesListType.find(4);
 	ASSERT_NE(TestFile.CategoriesListType.end(), TestFileIter);
-	ASSERT_EQ("home", TestFileIter->second);
+	ASSERT_EQ("work", TestFileIter->second);
+	
+	TestFileIter = TestFile.CategoriesListType.find(5);
+	ASSERT_NE(TestFile.CategoriesListType.end(), TestFileIter);
+	ASSERT_EQ("work", TestFileIter->second);
 	
 	// Check the ALTID section.
 	
-	TestFileIter = TestFile.CategoriesListAltID.find(1);
+	TestFileIter = TestFile.CategoriesListAltID.find(3);
 	ASSERT_NE(TestFile.CategoriesListAltID.end(), TestFileIter);
-	ASSERT_EQ("44", TestFileIter->second);
+	ASSERT_EQ("84", TestFileIter->second);
 
-	TestFileIter = TestFile.CategoriesListAltID.find(2);
+	TestFileIter = TestFile.CategoriesListAltID.find(4);
 	ASSERT_NE(TestFile.CategoriesListAltID.end(), TestFileIter);
-	ASSERT_EQ("44", TestFileIter->second);
+	ASSERT_EQ("84", TestFileIter->second);
+
+	TestFileIter = TestFile.CategoriesListAltID.find(5);
+	ASSERT_NE(TestFile.CategoriesListAltID.end(), TestFileIter);
+	ASSERT_EQ("84", TestFileIter->second);
 	
 	// Check the PID section.
 	
-	TestFileIter = TestFile.CategoriesListPID.find(1);
+	TestFileIter = TestFile.CategoriesListPID.find(3);
 	ASSERT_NE(TestFile.CategoriesListPID.end(), TestFileIter);
-	ASSERT_EQ("46", TestFileIter->second);
+	ASSERT_EQ("86", TestFileIter->second);
 
-	TestFileIter = TestFile.CategoriesListPID.find(2);
+	TestFileIter = TestFile.CategoriesListPID.find(4);
 	ASSERT_NE(TestFile.CategoriesListPID.end(), TestFileIter);
-	ASSERT_EQ("46", TestFileIter->second);
+	ASSERT_EQ("86", TestFileIter->second);
+
+	TestFileIter = TestFile.CategoriesListPID.find(5);
+	ASSERT_NE(TestFile.CategoriesListPID.end(), TestFileIter);
+	ASSERT_EQ("86", TestFileIter->second);
 	
 	// Check the LANGUAGE section.
 	
-	TestFileIter = TestFile.CategoriesListLanguage.find(1);
+	TestFileIter = TestFile.CategoriesListLanguage.find(3);
 	ASSERT_NE(TestFile.CategoriesListLanguage.end(), TestFileIter);
 	ASSERT_EQ("kw", TestFileIter->second);
 	
-	TestFileIter = TestFile.CategoriesListLanguage.find(2);
+	TestFileIter = TestFile.CategoriesListLanguage.find(4);
+	ASSERT_NE(TestFile.CategoriesListLanguage.end(), TestFileIter);
+	ASSERT_EQ("kw", TestFileIter->second);
+	
+	TestFileIter = TestFile.CategoriesListLanguage.find(5);
 	ASSERT_NE(TestFile.CategoriesListLanguage.end(), TestFileIter);
 	ASSERT_EQ("kw", TestFileIter->second);
 	
 	// Check the PREF section.
 	
-	TestFileIntIter = TestFile.CategoriesListPref.find(1);
+	TestFileIntIter = TestFile.CategoriesListPref.find(3);
 	ASSERT_NE(TestFile.CategoriesListPref.end(), TestFileIntIter);
-	ASSERT_EQ(48, TestFileIntIter->second);
+	ASSERT_EQ(88, TestFileIntIter->second);
 	
-	TestFileIntIter = TestFile.CategoriesListPref.find(2);
+	TestFileIntIter = TestFile.CategoriesListPref.find(4);
+	ASSERT_NE(TestFile.CategoriesListPref.end(), TestFileIntIter);
+	ASSERT_EQ(88, TestFileIntIter->second);
+	
+	TestFileIntIter = TestFile.CategoriesListPref.find(5);
 	ASSERT_NE(TestFile.CategoriesListPref.end(), TestFileIntIter);
-	ASSERT_EQ(48, TestFileIntIter->second);*/
+	ASSERT_EQ(88, TestFileIntIter->second);
 	
 	// Check the extra tokens.
 	
-	TestFileIter = TestFile.CategoriesListTokens.find(1);
+	TestFileIter = TestFile.CategoriesListTokens.find(3);
 	ASSERT_NE(TestFile.CategoriesListTokens.end(), TestFileIter);
-	ASSERT_EQ("TAC=CAT", TestFileIter->second);
+	ASSERT_EQ("AAA=BBB", TestFileIter->second);
 
-	TestFileIter = TestFile.CategoriesListTokens.find(2);
+	TestFileIter = TestFile.CategoriesListTokens.find(4);
 	ASSERT_NE(TestFile.CategoriesListTokens.end(), TestFileIter);
-	ASSERT_EQ("TAC=CAT", TestFileIter->second);
+	ASSERT_EQ("AAA=BBB", TestFileIter->second);
+
+	TestFileIter = TestFile.CategoriesListTokens.find(4);
+	ASSERT_NE(TestFile.CategoriesListTokens.end(), TestFileIter);
+	ASSERT_EQ("AAA=BBB", TestFileIter->second);
+
+}
+
+TEST(ContactLoad, PhotoTests){
+
+	ContactDataObject TestFile;
+
+	// Check that the vCard 4.0 file loads OK.
+
+	ASSERT_EQ(CONTACTLOAD_OK, TestFile.LoadFile("LoadCheck-Load4.vcf"));
+
+	std::map<int,std::string>::iterator TestStrIter;
+	std::map<int,wxString>::iterator TestFileIter;
+	std::map<int,int>::iterator TestFileIntIter;	
+
+	// Start with the first photo.
+	
+	TestStrIter = TestFile.PicturesList.find(0);
+	ASSERT_NE(TestFile.PicturesList.end(), TestStrIter);
+	ASSERT_EQ("iVBORw0KGgoAAAANSUhEUgAAABEAAAAKCAIAAADdHiL1AAAAJUlEQVQoz2NkwAb+//8PYTAyMmLKMjGQDuilhxHudBrbM8zCDQCxHQkPeaUvawAAAABJRU5ErkJggg==", 
+		TestStrIter->second);
+
+	// Check that it has the correct encoding.
+	
+	TestFileIter = TestFile.PicturesListPicEncType.find(0);
+	ASSERT_NE(TestFile.PicturesListPicEncType.end(), TestFileIter);
+	ASSERT_EQ("base64", TestFileIter->second);
+	
+	// Check that it has the correct image type.
+
+	TestFileIter = TestFile.PicturesListPictureType.find(0);
+	ASSERT_NE(TestFile.PicturesListPictureType.end(), TestFileIter);
+	ASSERT_EQ("image/png", TestFileIter->second);
+	
+	// Check the ALTID section.
+	
+	TestFileIter = TestFile.PicturesListAltID.find(0);
+	ASSERT_NE(TestFile.PicturesListAltID.end(), TestFileIter);
+	ASSERT_EQ("70", TestFileIter->second);
+	
+	// Check the PID section.
+	
+	TestFileIter = TestFile.PicturesListPID.find(0);
+	ASSERT_NE(TestFile.PicturesListPID.end(), TestFileIter);
+	ASSERT_EQ("71", TestFileIter->second);
+	
+	// Check the MEDIATYPE section.
+	
+	TestFileIter = TestFile.PicturesListMediatype.find(0);
+	ASSERT_NE(TestFile.PicturesListMediatype.end(), TestFileIter);
+	ASSERT_EQ("image/png", TestFileIter->second);
+	
+	// Check the PREF section.
+	
+	TestFileIntIter = TestFile.PicturesListPref.find(0);
+	ASSERT_NE(TestFile.PicturesListPref.end(), TestFileIntIter);
+	ASSERT_EQ(72, TestFileIntIter->second);
+	
+	// Check the extra tokens.
+	
+	TestFileIter = TestFile.PicturesListTokens.find(0);
+	ASSERT_NE(TestFile.PicturesListTokens.end(), TestFileIter);
+	ASSERT_EQ("MEEP=MOO", TestFileIter->second);
+	
+	// Start with the second photo.
+	
+	TestStrIter = TestFile.PicturesList.find(1);
+	ASSERT_NE(TestFile.PicturesList.end(), TestStrIter);
+	ASSERT_EQ("iVBORw0KGgoAAAANSUhEUgAAABEAAAAKCAIAAADdHiL1AAAAHklEQVQoz2NkYPjPgAr+owkwMqIpYGIgHYzqGdx6AAKNAxMN5P6+AAAAAElFTkSuQmCC", 
+		TestStrIter->second);
+
+	// Check that it has the correct encoding.
+	
+	TestFileIter = TestFile.PicturesListPicEncType.find(1);
+	ASSERT_NE(TestFile.PicturesListPicEncType.end(), TestFileIter);
+	ASSERT_EQ("base64", TestFileIter->second);
+	
+	// Check that it has the correct image type.
+
+	TestFileIter = TestFile.PicturesListPictureType.find(1);
+	ASSERT_NE(TestFile.PicturesListPictureType.end(), TestFileIter);
+	ASSERT_EQ("image/png", TestFileIter->second);
+	
+	// Check the ALTID section.
+	
+	TestFileIter = TestFile.PicturesListAltID.find(1);
+	ASSERT_NE(TestFile.PicturesListAltID.end(), TestFileIter);
+	ASSERT_EQ("20", TestFileIter->second);
+	
+	// Check the PID section.
+	
+	TestFileIter = TestFile.PicturesListPID.find(1);
+	ASSERT_NE(TestFile.PicturesListPID.end(), TestFileIter);
+	ASSERT_EQ("21", TestFileIter->second);
+	
+	// Check the MEDIATYPE section.
+	
+	TestFileIter = TestFile.PicturesListMediatype.find(1);
+	ASSERT_NE(TestFile.PicturesListMediatype.end(), TestFileIter);
+	ASSERT_EQ("image/png", TestFileIter->second);
+	
+	// Check the PREF section.
+	
+	TestFileIntIter = TestFile.PicturesListPref.find(1);
+	ASSERT_NE(TestFile.PicturesListPref.end(), TestFileIntIter);
+	ASSERT_EQ(22, TestFileIntIter->second);
+	
+	// Check the extra tokens.
+	
+	TestFileIter = TestFile.PicturesListTokens.find(1);
+	ASSERT_NE(TestFile.PicturesListTokens.end(), TestFileIter);
+	ASSERT_EQ("BEEP=BOOP", TestFileIter->second);
+
+	// Start with the second photo.
+	
+	TestStrIter = TestFile.PicturesList.find(2);
+	ASSERT_NE(TestFile.PicturesList.end(), TestStrIter);
+	ASSERT_EQ("iVBORw0KGgoAAAANSUhEUgAAABEAAAAKCAIAAADdHiL1AAAAIElEQVQoz2MUm53EgApepsxF4XfaoylgYiAdjOoZ3HoAeuQD2WdxRzcAAAAASUVORK5CYII=", 
+		TestStrIter->second);
+
+	// Check that it has the correct encoding.
+	
+	TestFileIter = TestFile.PicturesListPicEncType.find(2);
+	ASSERT_NE(TestFile.PicturesListPicEncType.end(), TestFileIter);
+	ASSERT_EQ("base64", TestFileIter->second);
+	
+	// Check that it has the correct image type.
+
+	TestFileIter = TestFile.PicturesListPictureType.find(2);
+	ASSERT_NE(TestFile.PicturesListPictureType.end(), TestFileIter);
+	ASSERT_EQ("image/png", TestFileIter->second);
+	
+	// Check the ALTID section.
+	
+	TestFileIter = TestFile.PicturesListAltID.find(2);
+	ASSERT_NE(TestFile.PicturesListAltID.end(), TestFileIter);
+	ASSERT_EQ("90", TestFileIter->second);
+	
+	// Check the PID section.
+	
+	TestFileIter = TestFile.PicturesListPID.find(2);
+	ASSERT_NE(TestFile.PicturesListPID.end(), TestFileIter);
+	ASSERT_EQ("91", TestFileIter->second);
+	
+	// Check the MEDIATYPE section.
+	
+	TestFileIter = TestFile.PicturesListMediatype.find(2);
+	ASSERT_NE(TestFile.PicturesListMediatype.end(), TestFileIter);
+	ASSERT_EQ("image/png", TestFileIter->second);
+	
+	// Check the PREF section.
+	
+	TestFileIntIter = TestFile.PicturesListPref.find(2);
+	ASSERT_NE(TestFile.PicturesListPref.end(), TestFileIntIter);
+	ASSERT_EQ(92, TestFileIntIter->second);
+	
+	// Check the extra tokens.
+	
+	TestFileIter = TestFile.PicturesListTokens.find(2);
+	ASSERT_NE(TestFile.PicturesListTokens.end(), TestFileIter);
+	ASSERT_EQ("PHOTO=YUP", TestFileIter->second);
+	
+}
+
+TEST(ContactLoad, LogoTests){
+
+	ContactDataObject TestFile;
+
+	// Check that the vCard 4.0 file loads OK.
+
+	ASSERT_EQ(CONTACTLOAD_OK, TestFile.LoadFile("LoadCheck-Load4.vcf"));
+
+	std::map<int,std::string>::iterator TestStrIter;
+	std::map<int,wxString>::iterator TestFileIter;
+	std::map<int,int>::iterator TestFileIntIter;	
+
+	// Start with the first photo.
+	
+	TestStrIter = TestFile.LogosList.find(0);
+	ASSERT_NE(TestFile.LogosList.end(), TestStrIter);
+	ASSERT_EQ("iVBORw0KGgoAAAANSUhEUgAAABEAAAAKCAIAAADdHiL1AAAAJUlEQVQoz2NkwAb+//8PYTAyMmLKMjGQDuilhxHudBrbM8zCDQCxHQkPeaUvawAAAABJRU5ErkJggg==", 
+		TestStrIter->second);
+
+	// Check that it has the correct encoding.
+	
+	TestFileIter = TestFile.LogosListPicEncType.find(0);
+	ASSERT_NE(TestFile.LogosListPicEncType.end(), TestFileIter);
+	ASSERT_EQ("base64", TestFileIter->second);
+	
+	// Check that it has the correct image type.
+
+	TestFileIter = TestFile.LogosListPictureType.find(0);
+	ASSERT_NE(TestFile.LogosListPictureType.end(), TestFileIter);
+	ASSERT_EQ("image/png", TestFileIter->second);
+	
+	// Check the ALTID section.
+	
+	TestFileIter = TestFile.LogosListAltID.find(0);
+	ASSERT_NE(TestFile.LogosListAltID.end(), TestFileIter);
+	ASSERT_EQ("70", TestFileIter->second);
+	
+	// Check the PID section.
+	
+	TestFileIter = TestFile.LogosListPID.find(0);
+	ASSERT_NE(TestFile.LogosListPID.end(), TestFileIter);
+	ASSERT_EQ("71", TestFileIter->second);
+	
+	// Check the MEDIATYPE section.
+	
+	TestFileIter = TestFile.LogosListMediatype.find(0);
+	ASSERT_NE(TestFile.LogosListMediatype.end(), TestFileIter);
+	ASSERT_EQ("image/png", TestFileIter->second);
+	
+	// Check the PREF section.
+	
+	TestFileIntIter = TestFile.LogosListPref.find(0);
+	ASSERT_NE(TestFile.LogosListPref.end(), TestFileIntIter);
+	ASSERT_EQ(72, TestFileIntIter->second);
+	
+	// Check the extra tokens.
+	
+	TestFileIter = TestFile.LogosListTokens.find(0);
+	ASSERT_NE(TestFile.LogosListTokens.end(), TestFileIter);
+	ASSERT_EQ("MEEP=MOO", TestFileIter->second);
+	
+	// Start with the second photo.
+	
+	TestStrIter = TestFile.LogosList.find(1);
+	ASSERT_NE(TestFile.LogosList.end(), TestStrIter);
+	ASSERT_EQ("iVBORw0KGgoAAAANSUhEUgAAABEAAAAKCAIAAADdHiL1AAAAHklEQVQoz2NkYPjPgAr+owkwMqIpYGIgHYzqGdx6AAKNAxMN5P6+AAAAAElFTkSuQmCC", 
+		TestStrIter->second);
 
+	// Check that it has the correct encoding.
+	
+	TestFileIter = TestFile.LogosListPicEncType.find(1);
+	ASSERT_NE(TestFile.LogosListPicEncType.end(), TestFileIter);
+	ASSERT_EQ("base64", TestFileIter->second);
+	
+	// Check that it has the correct image type.
+
+	TestFileIter = TestFile.LogosListPictureType.find(1);
+	ASSERT_NE(TestFile.LogosListPictureType.end(), TestFileIter);
+	ASSERT_EQ("image/png", TestFileIter->second);
+	
+	// Check the ALTID section.
+	
+	TestFileIter = TestFile.LogosListAltID.find(1);
+	ASSERT_NE(TestFile.LogosListAltID.end(), TestFileIter);
+	ASSERT_EQ("20", TestFileIter->second);
+	
+	// Check the PID section.
+	
+	TestFileIter = TestFile.LogosListPID.find(1);
+	ASSERT_NE(TestFile.LogosListPID.end(), TestFileIter);
+	ASSERT_EQ("21", TestFileIter->second);
+	
+	// Check the MEDIATYPE section.
+	
+	TestFileIter = TestFile.LogosListMediatype.find(1);
+	ASSERT_NE(TestFile.LogosListMediatype.end(), TestFileIter);
+	ASSERT_EQ("image/png", TestFileIter->second);
+	
+	// Check the PREF section.
+	
+	TestFileIntIter = TestFile.LogosListPref.find(1);
+	ASSERT_NE(TestFile.LogosListPref.end(), TestFileIntIter);
+	ASSERT_EQ(22, TestFileIntIter->second);
+	
+	// Check the extra tokens.
+	
+	TestFileIter = TestFile.LogosListTokens.find(1);
+	ASSERT_NE(TestFile.LogosListTokens.end(), TestFileIter);
+	ASSERT_EQ("BEEP=BOOP", TestFileIter->second);
+
+	// Start with the second photo.
+	
+	TestStrIter = TestFile.LogosList.find(2);
+	ASSERT_NE(TestFile.LogosList.end(), TestStrIter);
+	ASSERT_EQ("iVBORw0KGgoAAAANSUhEUgAAABEAAAAKCAIAAADdHiL1AAAAIElEQVQoz2MUm53EgApepsxF4XfaoylgYiAdjOoZ3HoAeuQD2WdxRzcAAAAASUVORK5CYII=", 
+		TestStrIter->second);
+
+	// Check that it has the correct encoding.
+	
+	TestFileIter = TestFile.LogosListPicEncType.find(2);
+	ASSERT_NE(TestFile.LogosListPicEncType.end(), TestFileIter);
+	ASSERT_EQ("base64", TestFileIter->second);
+	
+	// Check that it has the correct image type.
+
+	TestFileIter = TestFile.LogosListPictureType.find(2);
+	ASSERT_NE(TestFile.LogosListPictureType.end(), TestFileIter);
+	ASSERT_EQ("image/png", TestFileIter->second);
+	
+	// Check the ALTID section.
+	
+	TestFileIter = TestFile.LogosListAltID.find(2);
+	ASSERT_NE(TestFile.LogosListAltID.end(), TestFileIter);
+	ASSERT_EQ("90", TestFileIter->second);
+	
+	// Check the PID section.
+	
+	TestFileIter = TestFile.LogosListPID.find(2);
+	ASSERT_NE(TestFile.LogosListPID.end(), TestFileIter);
+	ASSERT_EQ("91", TestFileIter->second);
+	
+	// Check the MEDIATYPE section.
+	
+	TestFileIter = TestFile.LogosListMediatype.find(2);
+	ASSERT_NE(TestFile.LogosListMediatype.end(), TestFileIter);
+	ASSERT_EQ("image/png", TestFileIter->second);
+	
+	// Check the PREF section.
+	
+	TestFileIntIter = TestFile.LogosListPref.find(2);
+	ASSERT_NE(TestFile.LogosListPref.end(), TestFileIntIter);
+	ASSERT_EQ(92, TestFileIntIter->second);
+	
+	// Check the extra tokens.
+	
+	TestFileIter = TestFile.LogosListTokens.find(2);
+	ASSERT_NE(TestFile.LogosListTokens.end(), TestFileIter);
+	ASSERT_EQ("LOGO=YUP", TestFileIter->second);
+	
 }
 
 // TODO: Add tests for the Contact Loading process.
\ No newline at end of file