X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Ftests%2Fxestiaab_contactload.h;h=aca50e4cca85a9a250e76318316c518be3df38d4;hp=cbbac4ae939dbe9653e4d36328897062df565625;hb=991f1b1f9333b7b4aae5543cc1c10474d33e83be;hpb=d5e5a52dfa7ba94138977833034789f794740134

diff --git a/source/tests/xestiaab_contactload.h b/source/tests/xestiaab_contactload.h
index cbbac4a..aca50e4 100644
--- a/source/tests/xestiaab_contactload.h
+++ b/source/tests/xestiaab_contactload.h
@@ -3210,8 +3210,6 @@ TEST(ContactLoad, SoundTests){
 
 TEST(ContactLoad, CalendarURITests){
 
-	// Setup the sound files first.
-
 	ContactDataObject TestFile;
 
 	// Check that the vCard 4.0 file loads OK.
@@ -3348,4 +3346,143 @@ TEST(ContactLoad, CalendarURITests){
 
 }
 
+TEST(ContactLoad, CalendarAddressURITests){
+
+	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 a general calendar request address.
+	
+ 	TestFileIter = TestFile.CalendarRequestList.find(0);
+	ASSERT_NE(TestFile.CalendarRequestList.end(), TestFileIter);
+	ASSERT_EQ("http://example.com/request", TestFileIter->second);
+	
+  	// Check the TYPE section.
+	
+	TestFileIter = TestFile.CalendarRequestListType.find(0);
+	ASSERT_EQ(TestFile.CalendarRequestListType.end(), TestFileIter);
+	
+	// Check the ALTID section.
+	
+	TestFileIter = TestFile.CalendarRequestListAltID.find(0);
+	ASSERT_NE(TestFile.CalendarRequestListAltID.end(), TestFileIter);
+	ASSERT_EQ("14", TestFileIter->second);
+	
+	// Check the PID section.
+	
+	TestFileIter = TestFile.CalendarRequestListPID.find(0);
+	ASSERT_NE(TestFile.CalendarRequestListPID.end(), TestFileIter);
+	ASSERT_EQ("11", TestFileIter->second);
+	
+	// Check the MEDIATYPE section.
+	
+	TestFileIter = TestFile.CalendarRequestListMediatype.find(0);
+	ASSERT_NE(TestFile.CalendarRequestListMediatype.end(), TestFileIter);
+	ASSERT_EQ("text/plain", TestFileIter->second);
+	
+	// Check the PREF section.
+	
+	TestFileIntIter = TestFile.CalendarRequestListPref.find(0);
+	ASSERT_NE(TestFile.CalendarRequestListPref.end(), TestFileIntIter);
+	ASSERT_EQ(12, TestFileIntIter->second);
+	
+	// Check the extra tokens.
+	
+	TestFileIter = TestFile.CalendarRequestListTokens.find(0);
+	ASSERT_NE(TestFile.CalendarRequestListTokens.end(), TestFileIter);
+	ASSERT_EQ("REQUEST=YES", TestFileIter->second);
+
+	// Start with a home calendar request address.
+	
+ 	TestFileIter = TestFile.CalendarRequestList.find(1);
+	ASSERT_NE(TestFile.CalendarRequestList.end(), TestFileIter);
+	ASSERT_EQ("http://example.com/home/request", TestFileIter->second);
+	
+  	// Check the TYPE section.
+	
+	TestFileIter = TestFile.CalendarRequestListType.find(1);
+	ASSERT_NE(TestFile.CalendarRequestListType.end(), TestFileIter);
+	ASSERT_EQ("home", TestFileIter->second);
+	
+	// Check the ALTID section.
+	
+	TestFileIter = TestFile.CalendarRequestListAltID.find(1);
+	ASSERT_NE(TestFile.CalendarRequestListAltID.end(), TestFileIter);
+	ASSERT_EQ("24", TestFileIter->second);
+	
+	// Check the PID section.
+	
+	TestFileIter = TestFile.CalendarRequestListPID.find(1);
+	ASSERT_NE(TestFile.CalendarRequestListPID.end(), TestFileIter);
+	ASSERT_EQ("21", TestFileIter->second);
+	
+	// Check the MEDIATYPE section.
+	
+	TestFileIter = TestFile.CalendarRequestListMediatype.find(1);
+	ASSERT_NE(TestFile.CalendarRequestListMediatype.end(), TestFileIter);
+	ASSERT_EQ("text/dryplain", TestFileIter->second);
+	
+	// Check the PREF section.
+	
+	TestFileIntIter = TestFile.CalendarRequestListPref.find(1);
+	ASSERT_NE(TestFile.CalendarRequestListPref.end(), TestFileIntIter);
+	ASSERT_EQ(22, TestFileIntIter->second);
+	
+	// Check the extra tokens.
+	
+	TestFileIter = TestFile.CalendarRequestListTokens.find(1);
+	ASSERT_NE(TestFile.CalendarRequestListTokens.end(), TestFileIter);
+	ASSERT_EQ("REQUEST=MAYBE", TestFileIter->second);
+
+	// Start with a business calendar request address.
+	
+ 	TestFileIter = TestFile.CalendarRequestList.find(2);
+	ASSERT_NE(TestFile.CalendarRequestList.end(), TestFileIter);
+	ASSERT_EQ("http://example.com/business/request", TestFileIter->second);
+	
+  	// Check the TYPE section.
+	
+	TestFileIter = TestFile.CalendarRequestListType.find(2);
+	ASSERT_NE(TestFile.CalendarRequestListType.end(), TestFileIter);
+	ASSERT_EQ("work", TestFileIter->second);
+	
+	// Check the ALTID section.
+	
+	TestFileIter = TestFile.CalendarRequestListAltID.find(2);
+	ASSERT_NE(TestFile.CalendarRequestListAltID.end(), TestFileIter);
+	ASSERT_EQ("34", TestFileIter->second);
+	
+	// Check the PID section.
+	
+	TestFileIter = TestFile.CalendarRequestListPID.find(2);
+	ASSERT_NE(TestFile.CalendarRequestListPID.end(), TestFileIter);
+	ASSERT_EQ("31", TestFileIter->second);
+	
+	// Check the MEDIATYPE section.
+	
+	TestFileIter = TestFile.CalendarRequestListMediatype.find(2);
+	ASSERT_NE(TestFile.CalendarRequestListMediatype.end(), TestFileIter);
+	ASSERT_EQ("text/stillwetink", TestFileIter->second);
+	
+	// Check the PREF section.
+	
+	TestFileIntIter = TestFile.CalendarRequestListPref.find(2);
+	ASSERT_NE(TestFile.CalendarRequestListPref.end(), TestFileIntIter);
+	ASSERT_EQ(32, TestFileIntIter->second);
+	
+	// Check the extra tokens.
+	
+	TestFileIter = TestFile.CalendarRequestListTokens.find(2);
+	ASSERT_NE(TestFile.CalendarRequestListTokens.end(), TestFileIter);
+	ASSERT_EQ("REQUEST=NO", TestFileIter->second);
+	
+
+}
+
 // TODO: Add tests for the Contact Loading process.
\ No newline at end of file