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.
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.
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.
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.
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.
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.
TestFileIter = TestFile.GeneralGeographyList.find(0);
ASSERT_NE(TestFile.GeneralGeographyList.end(), TestFileIter);
- ASSERT_EQ("geo:3.5,3.5", TestFileIter->second);
+ ASSERT_EQ("3.5,3.5", TestFileIter->second);
// Check the ALTID section.
TestFileIter = TestFile.HomeGeographyList.find(1);
ASSERT_NE(TestFile.HomeGeographyList.end(), TestFileIter);
- ASSERT_EQ("geo:7.0,7.0", TestFileIter->second);
+ ASSERT_EQ("7.0,7.0", TestFileIter->second);
// Check the ALTID section.
TestFileIter = TestFile.BusinessGeographyList.find(2);
ASSERT_NE(TestFile.BusinessGeographyList.end(), TestFileIter);
- ASSERT_EQ("geo:14.0,14.0", TestFileIter->second);
+ ASSERT_EQ("14.0,14.0", TestFileIter->second);
// Check the ALTID section.
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