X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Ftests%2Fxestiaab_contactload.h;h=4585abcca4deed4ffdb267809aabf0e75f4dd894;hb=02c28b750d6eb441da1053646ca981a4a6473b75;hp=d7c12105f6209ef3425c8eb1e87ce2693915f06e;hpb=1679607db68e8dc0de40711cb2123e68a8a52186;p=xestiaab%2F.git

diff --git a/source/tests/xestiaab_contactload.h b/source/tests/xestiaab_contactload.h
index d7c1210..4585abc 100644
--- a/source/tests/xestiaab_contactload.h
+++ b/source/tests/xestiaab_contactload.h
@@ -77,7 +77,7 @@ TEST(ContactLoad, ContactLoadTests){
 	ASSERT_NE(TestFile.GroupsListPref.end(), TestFileIntIter);
 	ASSERT_EQ(45, TestFileIntIter->second);
 	
-	// Check that MEDIATYPE parameter.
+	// Check the MEDIATYPE parameter.
 	
 	TestFileIter = TestFile.GroupsListMediaType.find(0);
 	ASSERT_NE(TestFile.GroupsListMediaType.end(), TestFileIter);
@@ -89,7 +89,55 @@ TEST(ContactLoad, ContactLoadTests){
 	ASSERT_NE(TestFile.GroupsListTokens.end(), TestFileIter);
 	ASSERT_EQ("EXAMPLE=Meep", TestFileIter->second);
 	
+	// Check that the formatted name has been read (FN).
+	
+	TestFileIter = TestFile.FullNamesList.find(0);
+	ASSERT_NE(TestFile.FullNamesList.end(), TestFileIter);
+	ASSERT_EQ("Test Contact", TestFileIter->second);
+	
+	// Check the TYPE parameter.
 
+	TestFileIter = TestFile.FullNamesListType.find(0);
+	ASSERT_NE(TestFile.FullNamesListType.end(), TestFileIter);
+	ASSERT_EQ("work", TestFileIter->second);
+	
+	// Check the LANGUAGE parameter.
+	
+	TestFileIter = TestFile.FullNamesListLanguage.find(0);
+	ASSERT_NE(TestFile.FullNamesListLanguage.end(), TestFileIter);
+	ASSERT_EQ("kw", TestFileIter->second);
+	
+	// Check the ALTID parameter.
+	
+	TestFileIter = TestFile.FullNamesListAltID.find(0);
+	ASSERT_NE(TestFile.FullNamesListAltID.end(), TestFileIter);
+	ASSERT_EQ("500", TestFileIter->second);
+
+	// Check the PID parameter.
+
+	TestFileIter = TestFile.FullNamesListPID.find(0);
+	ASSERT_NE(TestFile.FullNamesListPID.end(), TestFileIter);
+	ASSERT_EQ("40", TestFileIter->second);
+	
+	// Check the PREF parameter.
+	
+	TestFileIntIter = TestFile.FullNamesListPref.find(0);
+	ASSERT_NE(TestFile.FullNamesListPref.end(), TestFileIntIter);
+	ASSERT_EQ(45, TestFileIntIter->second);
+	
+	// Check for the extra tokens parameter.
+	
+	TestFileIter = TestFile.FullNamesListTokens.find(0);
+	ASSERT_NE(TestFile.FullNamesListTokens.end(), TestFileIter);
+	ASSERT_EQ("EXAMPLE=Baaa", TestFileIter->second);
+	
+	// Check that the name has been read (N).
+	
+	ASSERT_EQ("Test", TestFile.NameForename); 
+	ASSERT_EQ("3", TestFile.NameAltID); 
+	ASSERT_EQ("kw", TestFile.NameLanguage); 
+
+	
 }
 
 // TODO: Add tests for the Contact Loading process.
\ No newline at end of file