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

diff --git a/source/tests/xestiaab_contactload.h b/source/tests/xestiaab_contactload.h
index 0f3f88a..bc22008 100644
--- a/source/tests/xestiaab_contactload.h
+++ b/source/tests/xestiaab_contactload.h
@@ -1589,7 +1589,7 @@ TEST(ContactLoad, TitleTests){
 	std::map<int,wxString>::iterator TestFileIter;
 	std::map<int,int>::iterator TestFileIntIter;
 
-	// Start with the general URL.
+	// Start with the general title.
 	
 	TestFileIter = TestFile.GeneralTitleList.find(0);
 	ASSERT_NE(TestFile.GeneralTitleList.end(), TestFileIter);
@@ -1625,7 +1625,7 @@ TEST(ContactLoad, TitleTests){
 	ASSERT_NE(TestFile.GeneralTitleListTokens.end(), TestFileIter);
 	ASSERT_EQ("EEP=LIGHT", TestFileIter->second);
 
-	// Start with the home URL.
+	// Start with the home title.
 
 	TestFileIter = TestFile.HomeTitleList.find(1);
 	ASSERT_NE(TestFile.HomeTitleList.end(), TestFileIter);
@@ -1661,7 +1661,7 @@ TEST(ContactLoad, TitleTests){
 	ASSERT_NE(TestFile.HomeTitleListTokens.end(), TestFileIter);
 	ASSERT_EQ("EEP=DARK", TestFileIter->second);
 	
-	// Start with the business URL.
+	// Start with the business title.
 
 	TestFileIter = TestFile.BusinessTitleList.find(2);
 	ASSERT_NE(TestFile.BusinessTitleList.end(), TestFileIter);
@@ -1699,4 +1699,585 @@ TEST(ContactLoad, TitleTests){
 
 }
 
+TEST(ContactLoad, RoleTests){
+
+	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 role.
+	
+	TestFileIter = TestFile.GeneralRoleList.find(0);
+	ASSERT_NE(TestFile.GeneralRoleList.end(), TestFileIter);
+	ASSERT_EQ("Ordinary Person", TestFileIter->second);
+	
+	// Check the ALTID section.
+	
+	TestFileIter = TestFile.GeneralRoleListAltID.find(0);
+	ASSERT_NE(TestFile.GeneralRoleListAltID.end(), TestFileIter);
+	ASSERT_EQ("50", TestFileIter->second);
+	
+	// Check the PID section.
+	
+	TestFileIter = TestFile.GeneralRoleListPID.find(0);
+	ASSERT_NE(TestFile.GeneralRoleListPID.end(), TestFileIter);
+	ASSERT_EQ("51", TestFileIter->second);
+	
+	// Check the LANGUAGE section.
+	
+	TestFileIter = TestFile.GeneralRoleListLanguage.find(0);
+	ASSERT_NE(TestFile.GeneralRoleListLanguage.end(), TestFileIter);
+	ASSERT_EQ("en", TestFileIter->second);
+	
+	// Check the PREF section.
+	
+	TestFileIntIter = TestFile.GeneralRoleListPref.find(0);
+	ASSERT_NE(TestFile.GeneralRoleListPref.end(), TestFileIntIter);
+	ASSERT_EQ(52, TestFileIntIter->second);
+	
+	// Check the extra tokens.
+	
+	TestFileIter = TestFile.GeneralRoleListTokens.find(0);
+	ASSERT_NE(TestFile.GeneralRoleListTokens.end(), TestFileIter);
+	ASSERT_EQ("ASTERISK=None", TestFileIter->second);
+
+	// Start with the home role.
+
+	TestFileIter = TestFile.HomeRoleList.find(1);
+	ASSERT_NE(TestFile.HomeRoleList.end(), TestFileIter);
+	ASSERT_EQ("Ordinary Lazy Person", TestFileIter->second);
+	
+	// Check the ALTID section.
+	
+	TestFileIter = TestFile.HomeRoleListAltID.find(1);
+	ASSERT_NE(TestFile.HomeRoleListAltID.end(), TestFileIter);
+	ASSERT_EQ("60", TestFileIter->second);
+	
+	// Check the PID section.
+	
+	TestFileIter = TestFile.HomeRoleListPID.find(1);
+	ASSERT_NE(TestFile.HomeRoleListPID.end(), TestFileIter);
+	ASSERT_EQ("61", TestFileIter->second);
+	
+	// Check the LANGUAGE section.
+	
+	TestFileIter = TestFile.HomeRoleListLanguage.find(1);
+	ASSERT_NE(TestFile.HomeRoleListLanguage.end(), TestFileIter);
+	ASSERT_EQ("en-GB", TestFileIter->second);
+	
+	// Check the PREF section.
+	
+	TestFileIntIter = TestFile.HomeRoleListPref.find(1);
+	ASSERT_NE(TestFile.HomeRoleListPref.end(), TestFileIntIter);
+	ASSERT_EQ(62, TestFileIntIter->second);
+	
+	// Check the extra tokens.
+	
+	TestFileIter = TestFile.HomeRoleListTokens.find(1);
+	ASSERT_NE(TestFile.HomeRoleListTokens.end(), TestFileIter);
+	ASSERT_EQ("SOMEWHERE=There", TestFileIter->second);
+	
+	// Start with the business role.
+
+	TestFileIter = TestFile.BusinessRoleList.find(2);
+	ASSERT_NE(TestFile.BusinessRoleList.end(), TestFileIter);
+	ASSERT_EQ("Company Owner", TestFileIter->second);
+	
+	// Check the ALTID section.
+	
+	TestFileIter = TestFile.BusinessRoleListAltID.find(2);
+	ASSERT_NE(TestFile.BusinessRoleListAltID.end(), TestFileIter);
+	ASSERT_EQ("70", TestFileIter->second);
+	
+	// Check the PID section.
+	
+	TestFileIter = TestFile.BusinessRoleListPID.find(2);
+	ASSERT_NE(TestFile.BusinessRoleListPID.end(), TestFileIter);
+	ASSERT_EQ("71", TestFileIter->second);
+	
+	// Check the LANGUAGE section.
+	
+	TestFileIter = TestFile.BusinessRoleListLanguage.find(2);
+	ASSERT_NE(TestFile.BusinessRoleListLanguage.end(), TestFileIter);
+	ASSERT_EQ("en-AU", TestFileIter->second);
+	
+	// Check the PREF section.
+	
+	TestFileIntIter = TestFile.BusinessRoleListPref.find(2);
+	ASSERT_NE(TestFile.BusinessRoleListPref.end(), TestFileIntIter);
+	ASSERT_EQ(72, TestFileIntIter->second);
+	
+	// Check the extra tokens.
+	
+	TestFileIter = TestFile.BusinessRoleListTokens.find(2);
+	ASSERT_NE(TestFile.BusinessRoleListTokens.end(), TestFileIter);
+	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(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);
+
+}
+
 // TODO: Add tests for the Contact Loading process.
\ No newline at end of file