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

diff --git a/source/tests/xestiaab_contactload.h b/source/tests/xestiaab_contactload.h
index ece3063..66e548e 100644
--- a/source/tests/xestiaab_contactload.h
+++ b/source/tests/xestiaab_contactload.h
@@ -1816,8 +1816,814 @@ TEST(ContactLoad, RoleTests){
 	
 	TestFileIter = TestFile.BusinessRoleListTokens.find(2);
 	ASSERT_NE(TestFile.BusinessRoleListTokens.end(), TestFileIter);
-	ASSERT_EQ("HERE=Nope", TestFileIter->second);	
+	ASSERT_EQ("HERE=Nope", TestFileIter->second);
 
 }
 
+TEST(ContactLoad, OrganisationTests){
+
+	ContactDataObject TestFile;
+
+	// Check that the vCard 4.0 file loads OK.
+
+	ASSERT_EQ(CONTACTLOAD_OK, TestFile.LoadFile("LoadCheck-Load4.vcf"));
+
+	std::map<int,wxString>::iterator TestFileIter;
+	std::map<int,int>::iterator TestFileIntIter;
+
+	// Start with the general organisation.
+	
+	TestFileIter = TestFile.GeneralOrganisationsList.find(0);
+	ASSERT_NE(TestFile.GeneralOrganisationsList.end(), TestFileIter);
+	ASSERT_EQ("Ordinary Organisation", TestFileIter->second);
+	
+	// Check the SORT-AS section.
+
+	TestFileIter = TestFile.GeneralOrganisationsListSortAs.find(0);
+	ASSERT_NE(TestFile.GeneralOrganisationsListSortAs.end(), TestFileIter);
+	ASSERT_EQ("Organisation, Ordinary", TestFileIter->second);
+	
+	// Check the ALTID section.
+	
+	TestFileIter = TestFile.GeneralOrganisationsListAltID.find(0);
+	ASSERT_NE(TestFile.GeneralOrganisationsListAltID.end(), TestFileIter);
+	ASSERT_EQ("50", TestFileIter->second);
+	
+	// Check the PID section.
+	
+	TestFileIter = TestFile.GeneralOrganisationsListPID.find(0);
+	ASSERT_NE(TestFile.GeneralOrganisationsListPID.end(), TestFileIter);
+	ASSERT_EQ("51", TestFileIter->second);
+	
+	// Check the LANGUAGE section.
+	
+	TestFileIter = TestFile.GeneralOrganisationsListLanguage.find(0);
+	ASSERT_NE(TestFile.GeneralOrganisationsListLanguage.end(), TestFileIter);
+	ASSERT_EQ("en", TestFileIter->second);
+	
+	// Check the PREF section.
+	
+	TestFileIntIter = TestFile.GeneralOrganisationsListPref.find(0);
+	ASSERT_NE(TestFile.GeneralOrganisationsListPref.end(), TestFileIntIter);
+	ASSERT_EQ(52, TestFileIntIter->second);
+	
+	// Check the extra tokens.
+	
+	TestFileIter = TestFile.GeneralOrganisationsListTokens.find(0);
+	ASSERT_NE(TestFile.GeneralOrganisationsListTokens.end(), TestFileIter);
+	ASSERT_EQ("ASTERISK=None", TestFileIter->second);
+
+	// Start with the home Organisation.
+
+	TestFileIter = TestFile.HomeOrganisationsList.find(1);
+	ASSERT_NE(TestFile.HomeOrganisationsList.end(), TestFileIter);
+	ASSERT_EQ("Ordinary Lazy Person", TestFileIter->second);
+	
+	// Check the SORT-AS section.
+	
+	TestFileIter = TestFile.HomeOrganisationsListSortAs.find(1);
+	ASSERT_NE(TestFile.HomeOrganisationsListSortAs.end(), TestFileIter);
+	ASSERT_EQ("Person, Ordinary Lazy", TestFileIter->second);
+	
+	// Check the ALTID section.
+	
+	TestFileIter = TestFile.HomeOrganisationsListAltID.find(1);
+	ASSERT_NE(TestFile.HomeOrganisationsListAltID.end(), TestFileIter);
+	ASSERT_EQ("60", TestFileIter->second);
+	
+	// Check the PID section.
+	
+	TestFileIter = TestFile.HomeOrganisationsListPID.find(1);
+	ASSERT_NE(TestFile.HomeOrganisationsListPID.end(), TestFileIter);
+	ASSERT_EQ("61", TestFileIter->second);
+	
+	// Check the LANGUAGE section.
+	
+	TestFileIter = TestFile.HomeOrganisationsListLanguage.find(1);
+	ASSERT_NE(TestFile.HomeOrganisationsListLanguage.end(), TestFileIter);
+	ASSERT_EQ("en-GB", TestFileIter->second);
+	
+	// Check the PREF section.
+	
+	TestFileIntIter = TestFile.HomeOrganisationsListPref.find(1);
+	ASSERT_NE(TestFile.HomeOrganisationsListPref.end(), TestFileIntIter);
+	ASSERT_EQ(62, TestFileIntIter->second);
+	
+	// Check the extra tokens.
+	
+	TestFileIter = TestFile.HomeOrganisationsListTokens.find(1);
+	ASSERT_NE(TestFile.HomeOrganisationsListTokens.end(), TestFileIter);
+	ASSERT_EQ("SOMEWHERE=There", TestFileIter->second);
+	
+	// Start with the business Organisation.
+
+	TestFileIter = TestFile.BusinessOrganisationsList.find(2);
+	ASSERT_NE(TestFile.BusinessOrganisationsList.end(), TestFileIter);
+	ASSERT_EQ("Company Owner", TestFileIter->second);
+	
+	// Check the SORT-AS section.
+	
+	TestFileIter = TestFile.BusinessOrganisationsListSortAs.find(2);
+	ASSERT_NE(TestFile.BusinessOrganisationsListSortAs.end(), TestFileIter);
+	ASSERT_EQ("Owner, Company", TestFileIter->second);
+	
+	// Check the ALTID section.
+	
+	TestFileIter = TestFile.BusinessOrganisationsListAltID.find(2);
+	ASSERT_NE(TestFile.BusinessOrganisationsListAltID.end(), TestFileIter);
+	ASSERT_EQ("70", TestFileIter->second);
+	
+	// Check the PID section.
+	
+	TestFileIter = TestFile.BusinessOrganisationsListPID.find(2);
+	ASSERT_NE(TestFile.BusinessOrganisationsListPID.end(), TestFileIter);
+	ASSERT_EQ("71", TestFileIter->second);
+	
+	// Check the LANGUAGE section.
+	
+	TestFileIter = TestFile.BusinessOrganisationsListLanguage.find(2);
+	ASSERT_NE(TestFile.BusinessOrganisationsListLanguage.end(), TestFileIter);
+	ASSERT_EQ("en-AU", TestFileIter->second);
+	
+	// Check the PREF section.
+	
+	TestFileIntIter = TestFile.BusinessOrganisationsListPref.find(2);
+	ASSERT_NE(TestFile.BusinessOrganisationsListPref.end(), TestFileIntIter);
+	ASSERT_EQ(72, TestFileIntIter->second);
+	
+	// Check the extra tokens.
+	
+	TestFileIter = TestFile.BusinessOrganisationsListTokens.find(2);
+	ASSERT_NE(TestFile.BusinessOrganisationsListTokens.end(), TestFileIter);
+	ASSERT_EQ("HERE=Nope", TestFileIter->second);
+
+}
+
+TEST(ContactLoad, NoteTests){
+
+	ContactDataObject TestFile;
+
+	// Check that the vCard 4.0 file loads OK.
+
+	ASSERT_EQ(CONTACTLOAD_OK, TestFile.LoadFile("LoadCheck-Load4.vcf"));
+
+	std::map<int,wxString>::iterator TestFileIter;
+	std::map<int,int>::iterator TestFileIntIter;
+	
+	// Start with the general note.
+	
+	TestFileIter = TestFile.GeneralNoteList.find(0);
+	ASSERT_NE(TestFile.GeneralNoteList.end(), TestFileIter);
+	ASSERT_EQ("Note\n\nLine 3\nLine 4\nLine 5", TestFileIter->second);
+	
+	// Check the ALTID section.
+	
+	TestFileIter = TestFile.GeneralNoteListAltID.find(0);
+	ASSERT_NE(TestFile.GeneralNoteListAltID.end(), TestFileIter);
+	ASSERT_EQ("90", TestFileIter->second);
+	
+	// Check the PID section.
+	
+	TestFileIter = TestFile.GeneralNoteListPID.find(0);
+	ASSERT_NE(TestFile.GeneralNoteListPID.end(), TestFileIter);
+	ASSERT_EQ("91", TestFileIter->second);
+	
+	// Check the LANGUAGE section.
+	
+	TestFileIter = TestFile.GeneralNoteListLanguage.find(0);
+	ASSERT_NE(TestFile.GeneralNoteListLanguage.end(), TestFileIter);
+	ASSERT_EQ("en", TestFileIter->second);
+	
+	// Check the PREF section.
+	
+	TestFileIntIter = TestFile.GeneralNoteListPref.find(0);
+	ASSERT_NE(TestFile.GeneralNoteListPref.end(), TestFileIntIter);
+	ASSERT_EQ(92, TestFileIntIter->second);
+	
+	// Check the extra tokens.
+	
+	TestFileIter = TestFile.GeneralNoteListTokens.find(0);
+	ASSERT_NE(TestFile.GeneralNoteListTokens.end(), TestFileIter);
+	ASSERT_EQ("WOO=WOOP", TestFileIter->second);
+
+	// Start with the home note.
+	
+	TestFileIter = TestFile.HomeNoteList.find(1);
+	ASSERT_NE(TestFile.HomeNoteList.end(), TestFileIter);
+	ASSERT_EQ("Note\n\n\n\nLine 5\nLine 6\nLine 7", TestFileIter->second);
+	
+	// Check the ALTID section.
+	
+	TestFileIter = TestFile.HomeNoteListAltID.find(1);
+	ASSERT_NE(TestFile.HomeNoteListAltID.end(), TestFileIter);
+	ASSERT_EQ("80", TestFileIter->second);
+	
+	// Check the PID section.
+	
+	TestFileIter = TestFile.HomeNoteListPID.find(1);
+	ASSERT_NE(TestFile.HomeNoteListPID.end(), TestFileIter);
+	ASSERT_EQ("81", TestFileIter->second);
+	
+	// Check the LANGUAGE section.
+	
+	TestFileIter = TestFile.HomeNoteListLanguage.find(1);
+	ASSERT_NE(TestFile.HomeNoteListLanguage.end(), TestFileIter);
+	ASSERT_EQ("kw", TestFileIter->second);
+	
+	// Check the PREF section.
+	
+	TestFileIntIter = TestFile.HomeNoteListPref.find(1);
+	ASSERT_NE(TestFile.HomeNoteListPref.end(), TestFileIntIter);
+	ASSERT_EQ(82, TestFileIntIter->second);
+	
+	// Check the extra tokens.
+	
+	TestFileIter = TestFile.HomeNoteListTokens.find(1);
+	ASSERT_NE(TestFile.HomeNoteListTokens.end(), TestFileIter);
+	ASSERT_EQ("MOO=MEEP", TestFileIter->second);
+
+	// Start with the business note.
+	
+	TestFileIter = TestFile.BusinessNoteList.find(2);
+	ASSERT_NE(TestFile.BusinessNoteList.end(), TestFileIter);
+	ASSERT_EQ("Note\n\n\n\nLine 8\nLine 9\nLine 10", TestFileIter->second);
+	
+	// Check the ALTID section.
+	
+	TestFileIter = TestFile.BusinessNoteListAltID.find(2);
+	ASSERT_NE(TestFile.BusinessNoteListAltID.end(), TestFileIter);
+	ASSERT_EQ("70", TestFileIter->second);
+	
+	// Check the PID section.
+	
+	TestFileIter = TestFile.BusinessNoteListPID.find(2);
+	ASSERT_NE(TestFile.BusinessNoteListPID.end(), TestFileIter);
+	ASSERT_EQ("71", TestFileIter->second);
+	
+	// Check the LANGUAGE section.
+	
+	TestFileIter = TestFile.BusinessNoteListLanguage.find(2);
+	ASSERT_NE(TestFile.BusinessNoteListLanguage.end(), TestFileIter);
+	ASSERT_EQ("fr", TestFileIter->second);
+	
+	// Check the PREF section.
+	
+	TestFileIntIter = TestFile.BusinessNoteListPref.find(2);
+	ASSERT_NE(TestFile.BusinessNoteListPref.end(), TestFileIntIter);
+	ASSERT_EQ(72, TestFileIntIter->second);
+	
+	// Check the extra tokens.
+	
+	TestFileIter = TestFile.BusinessNoteListTokens.find(2);
+	ASSERT_NE(TestFile.BusinessNoteListTokens.end(), TestFileIter);
+	ASSERT_EQ("BOING=BOOP", TestFileIter->second);
+
+}
+
+TEST(ContactLoad, CategoryTests){
+
+	ContactDataObject TestFile;
+
+	// Check that the vCard 4.0 file loads OK.
+
+	ASSERT_EQ(CONTACTLOAD_OK, TestFile.LoadFile("LoadCheck-Load4.vcf"));
+
+	std::map<int,wxString>::iterator TestFileIter;
+	std::map<int,int>::iterator TestFileIntIter;	
+
+	// Start with the first category.
+	
+	TestFileIter = TestFile.CategoriesList.find(0);
+	ASSERT_NE(TestFile.CategoriesList.end(), TestFileIter);
+	ASSERT_EQ("Category One", TestFileIter->second);
+	
+	// Check the TYPE section.
+	
+	TestFileIter = TestFile.CategoriesListType.find(0);
+	ASSERT_EQ(TestFile.CategoriesListType.end(), TestFileIter);
+	
+	// Check the ALTID section.
+	
+	TestFileIter = TestFile.CategoriesListAltID.find(0);
+	ASSERT_NE(TestFile.CategoriesListAltID.end(), TestFileIter);
+	ASSERT_EQ("40", TestFileIter->second);
+	
+	// Check the PID section.
+	
+	TestFileIter = TestFile.CategoriesListPID.find(0);
+	ASSERT_NE(TestFile.CategoriesListPID.end(), TestFileIter);
+	ASSERT_EQ("41", TestFileIter->second);
+	
+	// Check the LANGUAGE section.
+	
+	TestFileIter = TestFile.CategoriesListLanguage.find(0);
+	ASSERT_NE(TestFile.CategoriesListLanguage.end(), TestFileIter);
+	ASSERT_EQ("en", TestFileIter->second);
+	
+	// Check the PREF section.
+	
+	TestFileIntIter = TestFile.CategoriesListPref.find(0);
+	ASSERT_NE(TestFile.CategoriesListPref.end(), TestFileIntIter);
+	ASSERT_EQ(42, TestFileIntIter->second);
+	
+	// Check the extra tokens.
+	
+	TestFileIter = TestFile.CategoriesListTokens.find(0);
+	ASSERT_NE(TestFile.CategoriesListTokens.end(), TestFileIter);
+	ASSERT_EQ("CAT=TAC", TestFileIter->second);
+	
+	// Start with the second & third category.
+	// (Category Two, Category Three).
+	
+	TestFileIter = TestFile.CategoriesList.find(1);
+	ASSERT_NE(TestFile.CategoriesList.end(), TestFileIter);
+	ASSERT_EQ("Category Two", TestFileIter->second);
+	
+	TestFileIter = TestFile.CategoriesList.find(2);
+	ASSERT_NE(TestFile.CategoriesList.end(), TestFileIter);
+	ASSERT_EQ("Category Three", TestFileIter->second);
+
+	// Check the TYPE section.
+	
+	TestFileIter = TestFile.CategoriesListType.find(1);
+	ASSERT_NE(TestFile.CategoriesListType.end(), TestFileIter);
+	ASSERT_EQ("home", TestFileIter->second);
+
+	TestFileIter = TestFile.CategoriesListType.find(2);
+	ASSERT_NE(TestFile.CategoriesListType.end(), TestFileIter);
+	ASSERT_EQ("home", TestFileIter->second);
+	
+	// Check the ALTID section.
+	
+	TestFileIter = TestFile.CategoriesListAltID.find(1);
+	ASSERT_NE(TestFile.CategoriesListAltID.end(), TestFileIter);
+	ASSERT_EQ("44", TestFileIter->second);
+
+	TestFileIter = TestFile.CategoriesListAltID.find(2);
+	ASSERT_NE(TestFile.CategoriesListAltID.end(), TestFileIter);
+	ASSERT_EQ("44", TestFileIter->second);
+	
+	// Check the PID section.
+	
+	TestFileIter = TestFile.CategoriesListPID.find(1);
+	ASSERT_NE(TestFile.CategoriesListPID.end(), TestFileIter);
+	ASSERT_EQ("46", TestFileIter->second);
+
+	TestFileIter = TestFile.CategoriesListPID.find(2);
+	ASSERT_NE(TestFile.CategoriesListPID.end(), TestFileIter);
+	ASSERT_EQ("46", TestFileIter->second);
+	
+	// Check the LANGUAGE section.
+	
+	TestFileIter = TestFile.CategoriesListLanguage.find(1);
+	ASSERT_NE(TestFile.CategoriesListLanguage.end(), TestFileIter);
+	ASSERT_EQ("kw", TestFileIter->second);
+	
+	TestFileIter = TestFile.CategoriesListLanguage.find(2);
+	ASSERT_NE(TestFile.CategoriesListLanguage.end(), TestFileIter);
+	ASSERT_EQ("kw", TestFileIter->second);
+	
+	// Check the PREF section.
+	
+	TestFileIntIter = TestFile.CategoriesListPref.find(1);
+	ASSERT_NE(TestFile.CategoriesListPref.end(), TestFileIntIter);
+	ASSERT_EQ(48, TestFileIntIter->second);
+	
+	TestFileIntIter = TestFile.CategoriesListPref.find(2);
+	ASSERT_NE(TestFile.CategoriesListPref.end(), TestFileIntIter);
+	ASSERT_EQ(48, TestFileIntIter->second);
+	
+	// Check the extra tokens.
+	
+	TestFileIter = TestFile.CategoriesListTokens.find(1);
+	ASSERT_NE(TestFile.CategoriesListTokens.end(), TestFileIter);
+	ASSERT_EQ("TAC=CAT", TestFileIter->second);
+
+	TestFileIter = TestFile.CategoriesListTokens.find(2);
+	ASSERT_NE(TestFile.CategoriesListTokens.end(), TestFileIter);
+	ASSERT_EQ("TAC=CAT", TestFileIter->second);
+
+	// Start with the third, fourth & fifth category.
+	// (Category Three,Category Four,Category Five).
+	
+	TestFileIter = TestFile.CategoriesList.find(3);
+	ASSERT_NE(TestFile.CategoriesList.end(), TestFileIter);
+	ASSERT_EQ("Category Four", TestFileIter->second.ToStdString());
+	
+	TestFileIter = TestFile.CategoriesList.find(4);
+	ASSERT_NE(TestFile.CategoriesList.end(), TestFileIter);
+	ASSERT_EQ("Category Five", TestFileIter->second.ToStdString());
+
+	TestFileIter = TestFile.CategoriesList.find(5);
+	ASSERT_NE(TestFile.CategoriesList.end(), TestFileIter);
+	ASSERT_EQ("Category Six", TestFileIter->second);
+
+	// Check the TYPE section.
+	
+	TestFileIter = TestFile.CategoriesListType.find(3);
+	ASSERT_NE(TestFile.CategoriesListType.end(), TestFileIter);
+	ASSERT_EQ("work", TestFileIter->second);
+
+	TestFileIter = TestFile.CategoriesListType.find(4);
+	ASSERT_NE(TestFile.CategoriesListType.end(), TestFileIter);
+	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(3);
+	ASSERT_NE(TestFile.CategoriesListAltID.end(), TestFileIter);
+	ASSERT_EQ("84", TestFileIter->second);
+
+	TestFileIter = TestFile.CategoriesListAltID.find(4);
+	ASSERT_NE(TestFile.CategoriesListAltID.end(), TestFileIter);
+	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(3);
+	ASSERT_NE(TestFile.CategoriesListPID.end(), TestFileIter);
+	ASSERT_EQ("86", TestFileIter->second);
+
+	TestFileIter = TestFile.CategoriesListPID.find(4);
+	ASSERT_NE(TestFile.CategoriesListPID.end(), TestFileIter);
+	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(3);
+	ASSERT_NE(TestFile.CategoriesListLanguage.end(), TestFileIter);
+	ASSERT_EQ("kw", TestFileIter->second);
+	
+	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(3);
+	ASSERT_NE(TestFile.CategoriesListPref.end(), TestFileIntIter);
+	ASSERT_EQ(88, TestFileIntIter->second);
+	
+	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(88, TestFileIntIter->second);
+	
+	// Check the extra tokens.
+	
+	TestFileIter = TestFile.CategoriesListTokens.find(3);
+	ASSERT_NE(TestFile.CategoriesListTokens.end(), TestFileIter);
+	ASSERT_EQ("AAA=BBB", TestFileIter->second);
+
+	TestFileIter = TestFile.CategoriesListTokens.find(4);
+	ASSERT_NE(TestFile.CategoriesListTokens.end(), TestFileIter);
+	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