Add the helper function ParseAddressFieldsRequired().

This function corresponds to the existing ParseAddressFieldsFormat() but
parses the "required" field instead of the "format" field, which has a
slightly different syntax.

git-svn-id: http://libaddressinput.googlecode.com/svn/trunk@196 38ededc0-08b8-5190-f2ac-b31f878777ad

1 files changed, 21 insertions, 4 deletions

diff --git a/cpp/test/address_field_util_test.cc b/cpp/test/address_field_util_test.cc
index ee8d906..ce725b8 100644
--- a/cpp/test/address_field_util_test.cc
+++ b/cpp/test/address_field_util_test.cc
@@ -32,7 +32,7 @@ using i18n::addressinput::POSTAL_CODE;
 using i18n::addressinput::RECIPIENT;
 using i18n::addressinput::STREET_ADDRESS;
 
-TEST(AddressFieldUtilTest, ParseNewlineFormat) {
+TEST(AddressFieldUtilTest, FormatParseNewline) {
   std::vector<AddressField> actual;
   ParseAddressFieldsFormat("%O%n%N%n%A%nAX-%Z %C%nÅLAND", &actual);
 
@@ -49,23 +49,40 @@ TEST(AddressFieldUtilTest, ParseNewlineFormat) {
   EXPECT_EQ(expected, actual);
 }
 
-TEST(AddressFieldUtilTest, DoubleTokenPrefixIsIgnored) {
+TEST(AddressFieldUtilTest, FormatDoubleTokenPrefixIsIgnored) {
   std::vector<AddressField> actual;
   ParseAddressFieldsFormat("%%R", &actual);
   std::vector<AddressField> expected(1, COUNTRY);
   EXPECT_EQ(expected, actual);
 }
 
-TEST(AddressFieldUtilTest, PrefixWithoutTokenIsIgnored) {
+TEST(AddressFieldUtilTest, FormatPrefixWithoutTokenIsIgnored) {
   std::vector<AddressField> actual;
   ParseAddressFieldsFormat("%", &actual);
   EXPECT_TRUE(actual.empty());
 }
 
-TEST(AddressFieldUtilTest, EmptyString) {
+TEST(AddressFieldUtilTest, FormatEmptyString) {
   std::vector<AddressField> fields;
   ParseAddressFieldsFormat(std::string(), &fields);
   EXPECT_TRUE(fields.empty());
 }
 
+TEST(AddressFieldUtilTest, RequiredParseDefault) {
+  std::vector<AddressField> actual;
+  ParseAddressFieldsRequired("AC", &actual);
+
+  std::vector<AddressField> expected;
+  expected.push_back(STREET_ADDRESS);
+  expected.push_back(LOCALITY);
+
+  EXPECT_EQ(expected, actual);
+}
+
+TEST(AddressFieldUtilTest, RequiredEmptyString) {
+  std::vector<AddressField> fields;
+  ParseAddressFieldsRequired(std::string(), &fields);
+  EXPECT_TRUE(fields.empty());
+}
+
 }  // namespace