X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Ftests%2Fxestiacalendar_commonfunctions.h;h=a06219887776303adb9da45363b57ba537bb88e2;hb=b4f62179380b58d35dc97a072e05ea0061ac36aa;hp=62a8aee9d857c620a440539cd1f0fa63bcff7769;hpb=a58210730137cbd41ab3a450c12b99b3b382e142;p=xestiacalendar%2F.git

diff --git a/source/tests/xestiacalendar_commonfunctions.h b/source/tests/xestiacalendar_commonfunctions.h
index 62a8aee..a062198 100644
--- a/source/tests/xestiacalendar_commonfunctions.h
+++ b/source/tests/xestiacalendar_commonfunctions.h
@@ -14,8 +14,7 @@ TEST(CommonFunctions, ProcessTextVectorsTests){
 	
 	vector<string> TextPropertiesExample1;
 	vector<string> TextValueExample1;
-	//multimap<string, string> TextExample1Results;
-	multimap<string, string> TextExample1TestResult1;
+	multimap<string, string> TextExample1TestResult;
 	
 	TextPropertiesExample1.push_back("ATTENDEE");
 	TextValueExample1.push_back("Example Attendee 1");
@@ -25,11 +24,59 @@ TEST(CommonFunctions, ProcessTextVectorsTests){
 	
 	TextPropertiesExample1.push_back("ATTENDEE");
 	TextValueExample1.push_back("Example Attendee 3");
+	
+	TextPropertiesExample1.push_back("CATEGORIES");
+	TextValueExample1.push_back("CATEGORY 1");
+
+	TextPropertiesExample1.push_back("CATEGORIES");
+	TextValueExample1.push_back("CATEGORY 2");
+	
+	TextPropertiesExample1.push_back("CATEGORIES");
+	TextValueExample1.push_back("CATEGORY 3");
+
+	TextPropertiesExample1.push_back("COMMENT");
+	TextValueExample1.push_back("This is the first comment.");
+
+	TextPropertiesExample1.push_back("COMMENT");
+	TextValueExample1.push_back("This is the second comment.");
+	
+	TextPropertiesExample1.push_back("COMMENT");
+	TextValueExample1.push_back("This is the third comment.");
+
+	TextPropertiesExample1.push_back("CONTACT;TEST=VALUE");
+	TextValueExample1.push_back("First Contact");
+
+	TextPropertiesExample1.push_back("CONTACT;LAZY=NOPE");
+	TextValueExample1.push_back("Second Contact");
+
+	TextPropertiesExample1.push_back("CONTACT;SETUP=NO");
+	TextValueExample1.push_back("Third Contact");
+
+	TextExample1TestResult.insert(make_pair("ATTENDEE", "Example Attendee 1"));
+	TextExample1TestResult.insert(make_pair("ATTENDEE", "Example Attendee 2"));
+	TextExample1TestResult.insert(make_pair("ATTENDEE", "Example Attendee 3"));
+	
+	ASSERT_EQ(TextExample1TestResult, ProcessTextVectors(&TextPropertiesExample1, &TextValueExample1, true, "ATTENDEE"));
+
+	TextExample1TestResult.clear();
+	TextExample1TestResult.insert(make_pair("CATEGORIES", "CATEGORY 1"));
+	TextExample1TestResult.insert(make_pair("CATEGORIES", "CATEGORY 2"));
+	TextExample1TestResult.insert(make_pair("CATEGORIES", "CATEGORY 3"));
+
+	ASSERT_EQ(TextExample1TestResult, ProcessTextVectors(&TextPropertiesExample1, &TextValueExample1, true, "CATEGORIES"));
+
+	TextExample1TestResult.clear();
+	TextExample1TestResult.insert(make_pair("COMMENT", "This is the first comment."));
+	TextExample1TestResult.insert(make_pair("COMMENT", "This is the second comment."));
+	TextExample1TestResult.insert(make_pair("COMMENT", "This is the third comment."));
+	
+	ASSERT_EQ(TextExample1TestResult, ProcessTextVectors(&TextPropertiesExample1, &TextValueExample1, true, "COMMENT"));
 
-	TextExample1TestResult1.insert(make_pair("ATTENDEE", "Example Attendee 1"));
-	TextExample1TestResult1.insert(make_pair("ATTENDEE", "Example Attendee 2"));
-	TextExample1TestResult1.insert(make_pair("ATTENDEE", "Example Attendee 3"));
+	TextExample1TestResult.clear();
+	TextExample1TestResult.insert(make_pair("CONTACT;TEST=VALUE", "First Contact"));
+	TextExample1TestResult.insert(make_pair("CONTACT;LAZY=NOPE", "Second Contact"));
+	TextExample1TestResult.insert(make_pair("CONTACT;SETUP=NO", "Third Contact"));
 	
-	ASSERT_EQ(TextExample1TestResult1, ProcessTextVectors(&TextPropertiesExample1, &TextValueExample1, true, "ATTENDEE"));
+	ASSERT_EQ(TextExample1TestResult, ProcessTextVectors(&TextPropertiesExample1, &TextValueExample1, true, "CONTACT"));
 
 }
\ No newline at end of file