X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Ftests%2Fxestiaab_contactload.h;h=10d10b0e5a94aa8c9191977df159c672c30b2339;hb=b9c2b33681e480071aa685c157b456bf5990ef41;hp=c573175a849caa464152d12faaa8b847728655b1;hpb=b19bbc6c6d83edfefba9c98e78a57d21eb8aa1a8;p=xestiaab%2F.git

diff --git a/source/tests/xestiaab_contactload.h b/source/tests/xestiaab_contactload.h
index c573175..10d10b0 100644
--- a/source/tests/xestiaab_contactload.h
+++ b/source/tests/xestiaab_contactload.h
@@ -133,7 +133,11 @@ TEST(ContactLoad, ContactLoadTests){
 	
 	// Check that the name has been read (N).
 	
+	ASSERT_EQ("Contact", TestFile.NameSurname);
 	ASSERT_EQ("Test", TestFile.NameForename);
+	ASSERT_EQ("Example", TestFile.NameOtherNames);
+	ASSERT_EQ("Robot", TestFile.NameTitle);
+	ASSERT_EQ("LOONY", TestFile.NameSuffix);
 	
 	// Check the ALTID parameter.
 	
@@ -150,7 +154,228 @@ TEST(ContactLoad, ContactLoadTests){
 	// Check the extra tokens parameter.
 	
 	ASSERT_EQ("TEST=Yes", TestFile.NameTokens);
+
+}
+
+TEST(ContactLoad, NicknameTests){
+
+	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;
+
+	// Check that the nickname has been read (NICKNAME). General.
+	
+	TestFileIter = TestFile.GeneralNicknamesList.find(0);
+	ASSERT_NE(TestFile.GeneralNicknamesList.end(), TestFileIter);	
+	ASSERT_EQ("Tester", TestFileIter->second);
+	
+	// Check the ALTID parameter.
+	
+	TestFileIter = TestFile.GeneralNicknamesListAltID.find(0);
+	ASSERT_NE(TestFile.GeneralNicknamesListAltID.end(), TestFileIter);
+	ASSERT_EQ("35", TestFileIter->second);
+	
+	// Check the PID parameter.
+	
+	TestFileIter = TestFile.GeneralNicknamesListPID.find(0);
+	ASSERT_NE(TestFile.GeneralNicknamesListPID.end(), TestFileIter);
+	ASSERT_EQ("50", TestFileIter->second);
+	
+	// Check the PREF parameter.
+
+	TestFileIntIter = TestFile.GeneralNicknamesListPref.find(0);
+	ASSERT_NE(TestFile.GeneralNicknamesListPref.end(), TestFileIntIter);
+	ASSERT_EQ(40, TestFileIntIter->second);
+
+	// Check the LANGUAGE parameter.
+
+	TestFileIter = TestFile.GeneralNicknamesListLanguage.find(0);
+	ASSERT_NE(TestFile.GeneralNicknamesListLanguage.end(), TestFileIter);
+	ASSERT_EQ("kw", TestFileIter->second);
+	
+	// Check the extra tokens parameter.
+	
+	TestFileIter = TestFile.GeneralNicknamesListTokens.find(0);
+	ASSERT_NE(TestFile.GeneralNicknamesListTokens.end(), TestFileIter);
+	ASSERT_EQ("YAY=Nope;Beep=Boop", TestFileIter->second);
+	
+	// Repeat for the home type.
+	
+	TestFileIter = TestFile.HomeNicknamesList.find(1);
+	ASSERT_NE(TestFile.HomeNicknamesList.end(), TestFileIter);	
+	ASSERT_EQ("Testy", TestFileIter->second);
 	
+	// Check the ALTID parameter.
+	
+	TestFileIter = TestFile.HomeNicknamesListAltID.find(1);
+	ASSERT_NE(TestFile.HomeNicknamesListAltID.end(), TestFileIter);
+	ASSERT_EQ("17", TestFileIter->second);
+	
+	// Check the PID parameter.
+	
+	TestFileIter = TestFile.HomeNicknamesListPID.find(1);
+	ASSERT_NE(TestFile.HomeNicknamesListPID.end(), TestFileIter);
+	ASSERT_EQ("39", TestFileIter->second);
+	
+	// Check the PREF parameter.
+
+	TestFileIntIter = TestFile.HomeNicknamesListPref.find(1);
+	ASSERT_NE(TestFile.HomeNicknamesListPref.end(), TestFileIntIter);
+	ASSERT_EQ(78, TestFileIntIter->second);
+
+	// Check the LANGUAGE parameter.
+
+	TestFileIter = TestFile.HomeNicknamesListLanguage.find(1);
+	ASSERT_NE(TestFile.HomeNicknamesListLanguage.end(), TestFileIter);
+	ASSERT_EQ("en", TestFileIter->second);
+	
+	// Check the extra tokens parameter.
+	
+	TestFileIter = TestFile.HomeNicknamesListTokens.find(1);
+	ASSERT_NE(TestFile.HomeNicknamesListTokens.end(), TestFileIter);
+	ASSERT_EQ("YAY=Yep;Beep=Boop", TestFileIter->second);
+	
+	// Repeat for the work type.
+	
+	TestFileIter = TestFile.BusinessNicknamesList.find(2);
+	ASSERT_NE(TestFile.BusinessNicknamesList.end(), TestFileIter);	
+	ASSERT_EQ("The Testing One", TestFileIter->second);
+	
+	// Check the ALTID parameter.
+	
+	TestFileIter = TestFile.BusinessNicknamesListAltID.find(2);
+	ASSERT_NE(TestFile.BusinessNicknamesListAltID.end(), TestFileIter);
+	ASSERT_EQ("99", TestFileIter->second);
+	
+	// Check the PID parameter.
+	
+	TestFileIter = TestFile.BusinessNicknamesListPID.find(2);
+	ASSERT_NE(TestFile.BusinessNicknamesListPID.end(), TestFileIter);
+	ASSERT_EQ("10", TestFileIter->second);
+	
+	// Check the PREF parameter.
+
+	TestFileIntIter = TestFile.BusinessNicknamesListPref.find(2);
+	ASSERT_NE(TestFile.BusinessNicknamesListPref.end(), TestFileIntIter);
+	ASSERT_EQ(1, TestFileIntIter->second);
+
+	// Check the LANGUAGE parameter.
+
+	TestFileIter = TestFile.BusinessNicknamesListLanguage.find(2);
+	ASSERT_NE(TestFile.BusinessNicknamesListLanguage.end(), TestFileIter);
+	ASSERT_EQ("en-GB", TestFileIter->second);
+	
+	// Check the extra tokens parameter.
+	
+	TestFileIter = TestFile.BusinessNicknamesListTokens.find(2);
+	ASSERT_NE(TestFile.BusinessNicknamesListTokens.end(), TestFileIter);
+	ASSERT_EQ("YAY=Maybe;Boop=Boing", TestFileIter->second);
+
+}
+
+TEST(ContactLoad, GenderTests){
+
+	// Check that the gender has been read.
+
+	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;
+	
+	ASSERT_NE("", TestFile.Gender);
+	ASSERT_EQ("F", TestFile.Gender);
+	ASSERT_EQ("Example Text", TestFile.GenderDetails);
+	ASSERT_EQ("BEEP=Boop", TestFile.GenderTokens);
+
+}
+
+TEST(ContactLoad, BirthdayTests){
+
+	// Check that the birthday has been read.
+
+	// Check that the gender has been read.
+
+	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;
+	
+	ASSERT_NE("", TestFile.Birthday);
+	ASSERT_EQ("20040101", TestFile.Birthday);
+	
+	// Check the ALTID parameter.
+	
+	ASSERT_EQ("35", TestFile.BirthdayAltID);
+	
+	// Check the CALSCALE parameter.
+	
+	ASSERT_EQ("georgian", TestFile.BirthdayCalScale);
+	
+	// Check the extra tokens parameter.
+
+	ASSERT_EQ("HAPPY=Days", TestFile.BirthdayTokens);
+	
+	// Check the VALUE parameter. (Note have to use a different file
+	// due to the *1 rule in RFC6350.
+	
+	ContactDataObject TestFileValue;
+	ASSERT_EQ(CONTACTLOAD_OK, TestFile.LoadFile("LoadCheck-Load4-BDayValue.vcf"));
+	
+	ASSERT_EQ("Circa 2000s", TestFile.Birthday);
+	
+}
+
+TEST(ContactLoad, AnniversaryTests){
+
+	// Check that the birthday has been read.
+
+	// Check that the gender has been read.
+
+	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;
+	
+	ASSERT_NE("", TestFile.Anniversary);
+	ASSERT_EQ("20200516", TestFile.Anniversary);
+	
+	// Check the ALTID parameter.
+	
+	ASSERT_EQ("70", TestFile.AnniversaryAltID);
+	
+	// Check the CALSCALE parameter.
+	
+	ASSERT_EQ("georgian", TestFile.AnniversaryCalScale);
+	
+	// Check the extra tokens parameter.
+
+	ASSERT_EQ("WONDERFUL=Day", TestFile.AnniversaryTokens);
+	
+	// Check the VALUE parameter. (Note have to use a different file
+	// due to the *1 rule in RFC6350.
+	
+	ContactDataObject TestFileValue;
+	ASSERT_EQ(CONTACTLOAD_OK, TestFile.LoadFile("LoadCheck-Load4-BDayValue.vcf"));
+	
+	ASSERT_EQ("Circa 2020s", TestFile.Anniversary);	
+
 }
 
 // TODO: Add tests for the Contact Loading process.
\ No newline at end of file