X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Ftests%2Fxestiaab_contactload.h;h=eb1d71b907ba9e23d10f13a8d8f9563bde6ef52c;hb=4792369396a497872b7aa4793bfd496d9c23aa4d;hp=1f910d20278f74ca25b23b58c576a0710e7a3174;hpb=db50ff1e15d18ad7e4451279f91086cc4d6050c5;p=xestiaab%2F.git diff --git a/source/tests/xestiaab_contactload.h b/source/tests/xestiaab_contactload.h index 1f910d2..eb1d71b 100644 --- a/source/tests/xestiaab_contactload.h +++ b/source/tests/xestiaab_contactload.h @@ -17,7 +17,7 @@ // with Xestia Address Book. If not, see #include -#include "../contacteditor/ContactDataObject.h" +#include "../contacteditor/cdo/ContactDataObject.h" TEST(ContactLoad, ContactLoadTests){ @@ -169,6 +169,55 @@ TEST(ContactLoad, UIDTest){ } +TEST(ContactLoad, ClientPIDMapTests){ + + ContactDataObject TestFile; + + ASSERT_EQ(CONTACTLOAD_OK, TestFile.LoadFile("LoadCheck-Load4.vcf")); + + std::map::iterator TestFileIter; + + // Test the first Client PID Map. + + TestFileIter = TestFile.ClientPIDList.find(0); + ASSERT_NE(TestFile.ClientPIDList.end(), TestFileIter); + ASSERT_EQ("1;urn;uuid:aaaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", TestFileIter->second); + + TestFileIter = TestFile.ClientPIDListTokens.find(0); + ASSERT_EQ(TestFile.ClientPIDListTokens.end(), TestFileIter); + + // Test the second Client PID Map. + + TestFileIter = TestFile.ClientPIDList.find(1); + ASSERT_NE(TestFile.ClientPIDList.end(), TestFileIter); + ASSERT_EQ("2;urn;uuid:ccccccccc-cccc-cccc-cccc-cccccccccccc", TestFileIter->second); + + TestFileIter = TestFile.ClientPIDListTokens.find(1); + ASSERT_EQ(TestFile.ClientPIDListTokens.end(), TestFileIter); + + // Test the third Client PID Map. + + TestFileIter = TestFile.ClientPIDListTokens.find(2); + ASSERT_NE(TestFile.ClientPIDListTokens.end(), TestFileIter); + ASSERT_EQ("MEEP=MOO;WOOP=WOO", TestFileIter->second); + + TestFileIter = TestFile.ClientPIDList.find(2); + ASSERT_NE(TestFile.ClientPIDList.end(), TestFileIter); + ASSERT_EQ("3;urn;uuid:bbbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb", TestFileIter->second); + +} + +TEST(ContactLoad, RevisionTests){ + + ContactDataObject TestFile; + + ASSERT_EQ(CONTACTLOAD_OK, TestFile.LoadFile("LoadCheck-Load4.vcf")); + + ASSERT_EQ("20151227T033000Z", TestFile.Revision); + ASSERT_EQ("TEST=YES;DATA=NO;MORE=MAYBE", TestFile.RevisionTokens); + +} + TEST(ContactLoad, SourceTests){ ContactDataObject TestFile; @@ -748,7 +797,7 @@ TEST(ContactLoad, AddressTests){ TestFileIter = TestFile.GeneralAddressListGeo.find(0); ASSERT_NE(TestFile.GeneralAddressListGeo.end(), TestFileIter); - ASSERT_EQ("\"geo:1.0, 1.0\"", TestFileIter->second); + ASSERT_EQ("geo:1.0, 1.0", TestFileIter->second); // Check the TZ section. @@ -834,7 +883,7 @@ TEST(ContactLoad, AddressTests){ TestFileIter = TestFile.HomeAddressListGeo.find(1); ASSERT_NE(TestFile.HomeAddressListGeo.end(), TestFileIter); - ASSERT_EQ("\"geo:4.0, 4.0\"", TestFileIter->second); + ASSERT_EQ("geo:4.0, 4.0", TestFileIter->second); // Check the TZ section. @@ -920,7 +969,7 @@ TEST(ContactLoad, AddressTests){ TestFileIter = TestFile.BusinessAddressListGeo.find(2); ASSERT_NE(TestFile.BusinessAddressListGeo.end(), TestFileIter); - ASSERT_EQ("\"geo:7.0, 7.0\"", TestFileIter->second); + ASSERT_EQ("geo:7.0, 7.0", TestFileIter->second); // Check the TZ section. @@ -1188,13 +1237,19 @@ TEST(ContactLoad, TelephoneTests){ TestFileIter = TestFile.GeneralTelephoneList.find(0); ASSERT_NE(TestFile.GeneralTelephoneList.end(), TestFileIter); - ASSERT_EQ("tel:00000000", TestFileIter->second); + ASSERT_EQ("00000000", TestFileIter->second); + + // Check the data type section. + + TestFileIter = TestFile.GeneralTelephoneListDataType.find(0); + ASSERT_NE(TestFile.GeneralTelephoneListDataType.end(), TestFileIter); + ASSERT_EQ("tel", TestFileIter->second); // Check the type section. TestFileIter = TestFile.GeneralTelephoneListTypeInfo.find(0); ASSERT_NE(TestFile.GeneralTelephoneListTypeInfo.end(), TestFileIter); - ASSERT_EQ("fax,mobile", TestFileIter->second); + ASSERT_EQ("fax,cell", TestFileIter->second.ToStdString()); // Check the ALTID section. @@ -1224,7 +1279,13 @@ TEST(ContactLoad, TelephoneTests){ TestFileIter = TestFile.HomeTelephoneList.find(1); ASSERT_NE(TestFile.HomeTelephoneList.end(), TestFileIter); - ASSERT_EQ("tel:00001111", TestFileIter->second); + ASSERT_EQ("00001111", TestFileIter->second); + + // Check the data type section. + + TestFileIter = TestFile.HomeTelephoneListDataType.find(1); + ASSERT_NE(TestFile.HomeTelephoneListDataType.end(), TestFileIter); + ASSERT_EQ("tel", TestFileIter->second); // Check the type section. @@ -1260,7 +1321,13 @@ TEST(ContactLoad, TelephoneTests){ TestFileIter = TestFile.BusinessTelephoneList.find(2); ASSERT_NE(TestFile.BusinessTelephoneList.end(), TestFileIter); - ASSERT_EQ("tel:22221111", TestFileIter->second); + ASSERT_EQ("22221111", TestFileIter->second); + + // Check the data type section. + + TestFileIter = TestFile.BusinessTelephoneListDataType.find(2); + ASSERT_NE(TestFile.BusinessTelephoneListDataType.end(), TestFileIter); + ASSERT_EQ("tel", TestFileIter->second); // Check the type section. @@ -2529,6 +2596,11 @@ TEST(ContactLoad, PhotoTests){ ASSERT_NE(TestFile.PicturesListPID.end(), TestFileIter); ASSERT_EQ("71", TestFileIter->second); + // Check the TYPE section. + + TestFileIter = TestFile.PicturesListType.find(0); + ASSERT_EQ(TestFile.PicturesListType.end(), TestFileIter); + // Check the MEDIATYPE section. TestFileIter = TestFile.PicturesListMediatype.find(0); @@ -2578,6 +2650,12 @@ TEST(ContactLoad, PhotoTests){ ASSERT_NE(TestFile.PicturesListPID.end(), TestFileIter); ASSERT_EQ("21", TestFileIter->second); + // Check the TYPE section. + + TestFileIter = TestFile.PicturesListType.find(1); + ASSERT_NE(TestFile.PicturesListType.end(), TestFileIter); + ASSERT_EQ("home", TestFileIter->second); + // Check the MEDIATYPE section. TestFileIter = TestFile.PicturesListMediatype.find(1); @@ -2627,6 +2705,12 @@ TEST(ContactLoad, PhotoTests){ ASSERT_NE(TestFile.PicturesListPID.end(), TestFileIter); ASSERT_EQ("91", TestFileIter->second); + // Check the TYPE section. + + TestFileIter = TestFile.PicturesListType.find(2); + ASSERT_NE(TestFile.PicturesListType.end(), TestFileIter); + ASSERT_EQ("work", TestFileIter->second); + // Check the MEDIATYPE section. TestFileIter = TestFile.PicturesListMediatype.find(2); @@ -2690,6 +2774,8 @@ TEST(ContactLoad, LogoTests){ ASSERT_NE(TestFile.LogosListPID.end(), TestFileIter); ASSERT_EQ("71", TestFileIter->second); + // Check the TYPE section. + // Check the MEDIATYPE section. TestFileIter = TestFile.LogosListMediatype.find(0); @@ -2738,6 +2824,12 @@ TEST(ContactLoad, LogoTests){ TestFileIter = TestFile.LogosListPID.find(1); ASSERT_NE(TestFile.LogosListPID.end(), TestFileIter); ASSERT_EQ("21", TestFileIter->second); + + // Check the TYPE section. + + TestFileIter = TestFile.LogosListType.find(1); + ASSERT_NE(TestFile.LogosListType.end(), TestFileIter); + ASSERT_EQ("home", TestFileIter->second); // Check the MEDIATYPE section. @@ -2788,6 +2880,12 @@ TEST(ContactLoad, LogoTests){ ASSERT_NE(TestFile.LogosListPID.end(), TestFileIter); ASSERT_EQ("91", TestFileIter->second); + // Check the TYPE section. + + TestFileIter = TestFile.LogosListType.find(2); + ASSERT_NE(TestFile.LogosListType.end(), TestFileIter); + ASSERT_EQ("work", TestFileIter->second); + // Check the MEDIATYPE section. TestFileIter = TestFile.LogosListMediatype.find(2); @@ -4218,6 +4316,4 @@ TEST(ContactLoad, XTokenTest){ ASSERT_NE(TestFile.XTokenListTokens.end(), TestFileIter); ASSERT_EQ("FOODS;STATUS=FAVOURITE;TYPE=CHEESEANDONION", TestFileIter->second.ToStdString()); -} - -// TODO: Add tests for the Contact Loading process. \ No newline at end of file +} \ No newline at end of file