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

diff --git a/source/tests/xestiaab_contactload.h b/source/tests/xestiaab_contactload.h
index 0f3f88a..ece3063 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,125 @@ 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);	
+
+}
+
 // TODO: Add tests for the Contact Loading process.
\ No newline at end of file