Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(87)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/autofill/core/browser/contact_info_unittest.cc

Issue 2744933004: [Autofill] Rewrite Autofill unitttests to use INSTANTIATE_TEST_CASE_P (Closed)
Patch Set: remove commented test case. Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/autofill/core/browser/autofill_field_unittest.cc ('k') | components/autofill/core/browser/credit_card_field.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/autofill/core/browser/contact_info_unittest.cc
diff --git a/components/autofill/core/browser/contact_info_unittest.cc b/components/autofill/core/browser/contact_info_unittest.cc
index d501b5d782d253e5f1127c210c9385bfe84f6067..d07dfa041f15e651b95094d9ca3e991570e19591 100644
--- a/components/autofill/core/browser/contact_info_unittest.cc
+++ b/components/autofill/core/browser/contact_info_unittest.cc
@@ -25,47 +25,53 @@ struct FullNameTestCase {
std::string given_name_output;
std::string middle_name_output;
std::string family_name_output;
-} full_name_test_cases[] = {
- { "", "", "", "" },
- { "John Smith", "John", "", "Smith" },
- { "Julien van der Poel", "Julien", "", "van der Poel" },
- { "John J Johnson", "John", "J", "Johnson" },
- { "John Smith, Jr.", "John", "", "Smith" },
- { "Mr John Smith", "John", "", "Smith" },
- { "Mr. John Smith", "John", "", "Smith" },
- { "Mr. John Smith, M.D.", "John", "", "Smith" },
- { "Mr. John Smith, MD", "John", "", "Smith" },
- { "Mr. John Smith MD", "John", "", "Smith" },
- { "William Hubert J.R.", "William", "Hubert", "J.R." },
- { "John Ma", "John", "", "Ma" },
- { "John Smith, MA", "John", "", "Smith" },
- { "John Jacob Jingleheimer Smith", "John Jacob", "Jingleheimer", "Smith" },
- { "Virgil", "Virgil", "", "" },
- { "Murray Gell-Mann", "Murray", "", "Gell-Mann" },
- { "Mikhail Yevgrafovich Saltykov-Shchedrin", "Mikhail", "Yevgrafovich",
- "Saltykov-Shchedrin" },
- { "Arthur Ignatius Conan Doyle", "Arthur Ignatius", "Conan", "Doyle" },
};
-TEST(NameInfoTest, SetFullName) {
- for (const FullNameTestCase& test_case : full_name_test_cases) {
- SCOPED_TRACE(test_case.full_name_input);
+class SetFullNameTest : public testing::TestWithParam<FullNameTestCase> {};
- NameInfo name;
- name.SetInfo(AutofillType(NAME_FULL),
- ASCIIToUTF16(test_case.full_name_input),
- "en-US");
- EXPECT_EQ(ASCIIToUTF16(test_case.given_name_output),
- name.GetInfo(AutofillType(NAME_FIRST), "en-US"));
- EXPECT_EQ(ASCIIToUTF16(test_case.middle_name_output),
- name.GetInfo(AutofillType(NAME_MIDDLE), "en-US"));
- EXPECT_EQ(ASCIIToUTF16(test_case.family_name_output),
- name.GetInfo(AutofillType(NAME_LAST), "en-US"));
- EXPECT_EQ(ASCIIToUTF16(test_case.full_name_input),
- name.GetInfo(AutofillType(NAME_FULL), "en-US"));
- }
+TEST_P(SetFullNameTest, SetFullName) {
+ auto test_case = GetParam();
+ SCOPED_TRACE(test_case.full_name_input);
+
+ NameInfo name;
+ name.SetInfo(AutofillType(NAME_FULL), ASCIIToUTF16(test_case.full_name_input),
+ "en-US");
+ EXPECT_EQ(ASCIIToUTF16(test_case.given_name_output),
+ name.GetInfo(AutofillType(NAME_FIRST), "en-US"));
+ EXPECT_EQ(ASCIIToUTF16(test_case.middle_name_output),
+ name.GetInfo(AutofillType(NAME_MIDDLE), "en-US"));
+ EXPECT_EQ(ASCIIToUTF16(test_case.family_name_output),
+ name.GetInfo(AutofillType(NAME_LAST), "en-US"));
+ EXPECT_EQ(ASCIIToUTF16(test_case.full_name_input),
+ name.GetInfo(AutofillType(NAME_FULL), "en-US"));
}
+INSTANTIATE_TEST_CASE_P(
+ ContactInfoTest,
+ SetFullNameTest,
+ testing::Values(
+ FullNameTestCase{"", "", "", ""},
+ FullNameTestCase{"John Smith", "John", "", "Smith"},
+ FullNameTestCase{"Julien van der Poel", "Julien", "", "van der Poel"},
+ FullNameTestCase{"John J Johnson", "John", "J", "Johnson"},
+ FullNameTestCase{"John Smith, Jr.", "John", "", "Smith"},
+ FullNameTestCase{"Mr John Smith", "John", "", "Smith"},
+ FullNameTestCase{"Mr. John Smith", "John", "", "Smith"},
+ FullNameTestCase{"Mr. John Smith, M.D.", "John", "", "Smith"},
+ FullNameTestCase{"Mr. John Smith, MD", "John", "", "Smith"},
+ FullNameTestCase{"Mr. John Smith MD", "John", "", "Smith"},
+ FullNameTestCase{"William Hubert J.R.", "William", "Hubert", "J.R."},
+ FullNameTestCase{"John Ma", "John", "", "Ma"},
+ FullNameTestCase{"John Smith, MA", "John", "", "Smith"},
+ FullNameTestCase{"John Jacob Jingleheimer Smith", "John Jacob",
+ "Jingleheimer", "Smith"},
+ FullNameTestCase{"Virgil", "Virgil", "", ""},
+ FullNameTestCase{"Murray Gell-Mann", "Murray", "", "Gell-Mann"},
+ FullNameTestCase{"Mikhail Yevgrafovich Saltykov-Shchedrin", "Mikhail",
+ "Yevgrafovich", "Saltykov-Shchedrin"},
+ FullNameTestCase{"Arthur Ignatius Conan Doyle", "Arthur Ignatius",
+ "Conan", "Doyle"}));
+
TEST(NameInfoTest, GetFullName) {
NameInfo name;
name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("First"));
@@ -174,209 +180,221 @@ TEST(NameInfoTest, GetFullName) {
name.GetInfo(AutofillType(NAME_FULL), "en-US"));
}
-TEST(NameInfoTest, ParsedNamesAreEqual) {
- struct TestCase {
- std::string starting_names[3];
- std::string additional_names[3];
- bool expected_result;
+struct ParsedNamesAreEqualTestCase {
+ std::string starting_names[3];
+ std::string additional_names[3];
+ bool expected_result;
};
- struct TestCase test_cases[] = {
- // Identical name comparison.
- {{"Marion", "Mitchell", "Morrison"},
- {"Marion", "Mitchell", "Morrison"},
- true},
-
- // Case-sensitive comparisons.
- {{"Marion", "Mitchell", "Morrison"},
- {"Marion", "Mitchell", "MORRISON"},
- false},
- {{"Marion", "Mitchell", "Morrison"},
- {"MARION", "Mitchell", "MORRISON"},
- false},
- {{"Marion", "Mitchell", "Morrison"},
- {"MARION", "MITCHELL", "MORRISON"},
- false},
- {{"Marion", "", "Mitchell Morrison"},
- {"MARION", "", "MITCHELL MORRISON"},
- false},
- {{"Marion Mitchell", "", "Morrison"},
- {"MARION MITCHELL", "", "MORRISON"},
- false},
-
- // Identical full names but different canonical forms.
- {{"Marion", "Mitchell", "Morrison"},
- {"Marion", "", "Mitchell Morrison"},
- false},
- {{"Marion", "Mitchell", "Morrison"},
- {"Marion Mitchell", "", "MORRISON"},
- false},
-
- // Different names.
- {{"Marion", "Mitchell", "Morrison"}, {"Marion", "M.", "Morrison"}, false},
- {{"Marion", "Mitchell", "Morrison"}, {"MARION", "M.", "MORRISON"}, false},
- {{"Marion", "Mitchell", "Morrison"},
- {"David", "Mitchell", "Morrison"},
- false},
-
- // Non-ASCII characters.
- {{"M\xc3\xa1rion Mitchell", "", "Morrison"},
- {"M\xc3\xa1rion Mitchell", "", "Morrison"},
- true},
- };
+ class ParsedNamesAreEqualTest
+ : public testing::TestWithParam<ParsedNamesAreEqualTestCase> {};
- for (size_t i = 0; i < arraysize(test_cases); ++i) {
- SCOPED_TRACE(base::StringPrintf("i: %" PRIuS, i));
+ TEST_P(ParsedNamesAreEqualTest, ParsedNamesAreEqual) {
+ auto test_case = GetParam();
// Construct the starting_profile.
NameInfo starting_profile;
starting_profile.SetRawInfo(NAME_FIRST,
- UTF8ToUTF16(test_cases[i].starting_names[0]));
+ UTF8ToUTF16(test_case.starting_names[0]));
starting_profile.SetRawInfo(NAME_MIDDLE,
- UTF8ToUTF16(test_cases[i].starting_names[1]));
+ UTF8ToUTF16(test_case.starting_names[1]));
starting_profile.SetRawInfo(NAME_LAST,
- UTF8ToUTF16(test_cases[i].starting_names[2]));
+ UTF8ToUTF16(test_case.starting_names[2]));
// Construct the additional_profile.
NameInfo additional_profile;
- additional_profile.SetRawInfo(
- NAME_FIRST, UTF8ToUTF16(test_cases[i].additional_names[0]));
- additional_profile.SetRawInfo(
- NAME_MIDDLE, UTF8ToUTF16(test_cases[i].additional_names[1]));
- additional_profile.SetRawInfo(
- NAME_LAST, UTF8ToUTF16(test_cases[i].additional_names[2]));
+ additional_profile.SetRawInfo(NAME_FIRST,
+ UTF8ToUTF16(test_case.additional_names[0]));
+ additional_profile.SetRawInfo(NAME_MIDDLE,
+ UTF8ToUTF16(test_case.additional_names[1]));
+ additional_profile.SetRawInfo(NAME_LAST,
+ UTF8ToUTF16(test_case.additional_names[2]));
// Verify the test expectations.
- EXPECT_EQ(test_cases[i].expected_result,
+ EXPECT_EQ(test_case.expected_result,
starting_profile.ParsedNamesAreEqual(additional_profile));
}
-}
-TEST(NameInfoTest, OverwriteName) {
- struct TestCase {
+ INSTANTIATE_TEST_CASE_P(
+ ContactInfoTest,
+ ParsedNamesAreEqualTest,
+ testing::Values(
+ // Identical name comparison.
+ ParsedNamesAreEqualTestCase{{"Marion", "Mitchell", "Morrison"},
+ {"Marion", "Mitchell", "Morrison"},
+ true},
+
+ // Case-sensitive comparisons.
+ ParsedNamesAreEqualTestCase{{"Marion", "Mitchell", "Morrison"},
+ {"Marion", "Mitchell", "MORRISON"},
+ false},
+ ParsedNamesAreEqualTestCase{{"Marion", "Mitchell", "Morrison"},
+ {"MARION", "Mitchell", "MORRISON"},
+ false},
+ ParsedNamesAreEqualTestCase{{"Marion", "Mitchell", "Morrison"},
+ {"MARION", "MITCHELL", "MORRISON"},
+ false},
+ ParsedNamesAreEqualTestCase{{"Marion", "", "Mitchell Morrison"},
+ {"MARION", "", "MITCHELL MORRISON"},
+ false},
+ ParsedNamesAreEqualTestCase{{"Marion Mitchell", "", "Morrison"},
+ {"MARION MITCHELL", "", "MORRISON"},
+ false},
+
+ // Identical full names but different canonical forms.
+ ParsedNamesAreEqualTestCase{{"Marion", "Mitchell", "Morrison"},
+ {"Marion", "", "Mitchell Morrison"},
+ false},
+ ParsedNamesAreEqualTestCase{{"Marion", "Mitchell", "Morrison"},
+ {"Marion Mitchell", "", "MORRISON"},
+ false},
+
+ // Different names.
+ ParsedNamesAreEqualTestCase{{"Marion", "Mitchell", "Morrison"},
+ {"Marion", "M.", "Morrison"},
+ false},
+ ParsedNamesAreEqualTestCase{{"Marion", "Mitchell", "Morrison"},
+ {"MARION", "M.", "MORRISON"},
+ false},
+ ParsedNamesAreEqualTestCase{{"Marion", "Mitchell", "Morrison"},
+ {"David", "Mitchell", "Morrison"},
+ false},
+
+ // Non-ASCII characters.
+ ParsedNamesAreEqualTestCase{
+ {"M\xc3\xa1rion Mitchell", "", "Morrison"},
+ {"M\xc3\xa1rion Mitchell", "", "Morrison"},
+ true}));
+
+ struct OverwriteNameTestCase {
std::string existing_name[4];
std::string new_name[4];
std::string expected_name[4];
};
- struct TestCase test_cases[] = {
- // Missing information in the original name gets filled with the new
- // name's information.
- {
- {"", "", "", ""},
- {"Marion", "Mitchell", "Morrison", "Marion Mitchell Morrison"},
- {"Marion", "Mitchell", "Morrison", "Marion Mitchell Morrison"},
- },
- // The new name's values overwrite the exsiting name values if they are
- // different
- {
- {"Marion", "Mitchell", "Morrison", "Marion Mitchell Morrison"},
- {"Mario", "Mitchell", "Thompson", "Mario Mitchell Morrison"},
- {"Mario", "Mitchell", "Thompson", "Mario Mitchell Morrison"},
- },
- // An existing name values do not get replaced with empty values.
- {
- {"Marion", "Mitchell", "Morrison", "Marion Mitchell Morrison"},
- {"", "", "", ""},
- {"Marion", "Mitchell", "Morrison", "Marion Mitchell Morrison"},
- },
- // An existing full middle not does not get replaced by a middle name
- // initial.
- {
- {"Marion", "Mitchell", "Morrison", "Marion Mitchell Morrison"},
- {"Marion", "M", "Morrison", "Marion Mitchell Morrison"},
- {"Marion", "Mitchell", "Morrison", "Marion Mitchell Morrison"},
- },
- // An existing middle name initial is overwritten by the new profile's
- // middle name value.
- {
- {"Marion", "M", "Morrison", "Marion Mitchell Morrison"},
- {"Marion", "Mitchell", "Morrison", "Marion Mitchell Morrison"},
- {"Marion", "Mitchell", "Morrison", "Marion Mitchell Morrison"},
- },
- // A NameInfo with only the full name set overwritten with a NameInfo
- // with only the name parts set result in a NameInfo with all the name
- // parts and name full set.
- {
- {"", "", "", "Marion Mitchell Morrison"},
- {"Marion", "Mitchell", "Morrison", ""},
- {"Marion", "Mitchell", "Morrison", "Marion Mitchell Morrison"},
- },
- // A NameInfo with only the name parts set overwritten with a NameInfo
- // with only the full name set result in a NameInfo with all the name
- // parts and name full set.
- {
- {"Marion", "Mitchell", "Morrison", ""},
- {"", "", "", "Marion Mitchell Morrison"},
- {"Marion", "Mitchell", "Morrison", "Marion Mitchell Morrison"},
- },
- };
-
- for (size_t i = 0; i < arraysize(test_cases); ++i) {
- SCOPED_TRACE(base::StringPrintf("i: %" PRIuS, i));
+ class OverwriteNameTest
+ : public testing::TestWithParam<OverwriteNameTestCase> {};
+ TEST_P(OverwriteNameTest, OverwriteName) {
+ auto test_case = GetParam();
// Construct the starting_profile.
NameInfo existing_name;
existing_name.SetRawInfo(NAME_FIRST,
- UTF8ToUTF16(test_cases[i].existing_name[0]));
+ UTF8ToUTF16(test_case.existing_name[0]));
existing_name.SetRawInfo(NAME_MIDDLE,
- UTF8ToUTF16(test_cases[i].existing_name[1]));
+ UTF8ToUTF16(test_case.existing_name[1]));
existing_name.SetRawInfo(NAME_LAST,
- UTF8ToUTF16(test_cases[i].existing_name[2]));
+ UTF8ToUTF16(test_case.existing_name[2]));
existing_name.SetRawInfo(NAME_FULL,
- UTF8ToUTF16(test_cases[i].existing_name[3]));
+ UTF8ToUTF16(test_case.existing_name[3]));
// Construct the additional_profile.
NameInfo new_name;
- new_name.SetRawInfo(NAME_FIRST, UTF8ToUTF16(test_cases[i].new_name[0]));
- new_name.SetRawInfo(NAME_MIDDLE, UTF8ToUTF16(test_cases[i].new_name[1]));
- new_name.SetRawInfo(NAME_LAST, UTF8ToUTF16(test_cases[i].new_name[2]));
- new_name.SetRawInfo(NAME_FULL, UTF8ToUTF16(test_cases[i].new_name[3]));
+ new_name.SetRawInfo(NAME_FIRST, UTF8ToUTF16(test_case.new_name[0]));
+ new_name.SetRawInfo(NAME_MIDDLE, UTF8ToUTF16(test_case.new_name[1]));
+ new_name.SetRawInfo(NAME_LAST, UTF8ToUTF16(test_case.new_name[2]));
+ new_name.SetRawInfo(NAME_FULL, UTF8ToUTF16(test_case.new_name[3]));
existing_name.OverwriteName(new_name);
// Verify the test expectations.
- EXPECT_EQ(UTF8ToUTF16(test_cases[i].expected_name[0]),
+ EXPECT_EQ(UTF8ToUTF16(test_case.expected_name[0]),
existing_name.GetRawInfo(NAME_FIRST));
- EXPECT_EQ(UTF8ToUTF16(test_cases[i].expected_name[1]),
+ EXPECT_EQ(UTF8ToUTF16(test_case.expected_name[1]),
existing_name.GetRawInfo(NAME_MIDDLE));
- EXPECT_EQ(UTF8ToUTF16(test_cases[i].expected_name[2]),
+ EXPECT_EQ(UTF8ToUTF16(test_case.expected_name[2]),
existing_name.GetRawInfo(NAME_LAST));
- EXPECT_EQ(UTF8ToUTF16(test_cases[i].expected_name[3]),
+ EXPECT_EQ(UTF8ToUTF16(test_case.expected_name[3]),
existing_name.GetRawInfo(NAME_FULL));
- }
}
-TEST(NameInfoTest, NamePartsAreEmpty) {
- struct TestCase {
- std::string first;
- std::string middle;
- std::string last;
- std::string full;
- bool expected_result;
+INSTANTIATE_TEST_CASE_P(
+ ContactInfoTest,
+ OverwriteNameTest,
+ testing::Values(
+ // Missing information in the original name gets filled with the new
+ // name's information.
+ OverwriteNameTestCase{
+ {"", "", "", ""},
+ {"Marion", "Mitchell", "Morrison", "Marion Mitchell Morrison"},
+ {"Marion", "Mitchell", "Morrison", "Marion Mitchell Morrison"},
+ },
+ // The new name's values overwrite the exsiting name values if they are
+ // different
+ OverwriteNameTestCase{
+ {"Marion", "Mitchell", "Morrison", "Marion Mitchell Morrison"},
+ {"Mario", "Mitchell", "Thompson", "Mario Mitchell Morrison"},
+ {"Mario", "Mitchell", "Thompson", "Mario Mitchell Morrison"},
+ },
+ // An existing name values do not get replaced with empty values.
+ OverwriteNameTestCase{
+ {"Marion", "Mitchell", "Morrison", "Marion Mitchell Morrison"},
+ {"", "", "", ""},
+ {"Marion", "Mitchell", "Morrison", "Marion Mitchell Morrison"},
+ },
+ // An existing full middle not does not get replaced by a middle name
+ // initial.
+ OverwriteNameTestCase{
+ {"Marion", "Mitchell", "Morrison", "Marion Mitchell Morrison"},
+ {"Marion", "M", "Morrison", "Marion Mitchell Morrison"},
+ {"Marion", "Mitchell", "Morrison", "Marion Mitchell Morrison"},
+ },
+ // An existing middle name initial is overwritten by the new profile's
+ // middle name value.
+ OverwriteNameTestCase{
+ {"Marion", "M", "Morrison", "Marion Mitchell Morrison"},
+ {"Marion", "Mitchell", "Morrison", "Marion Mitchell Morrison"},
+ {"Marion", "Mitchell", "Morrison", "Marion Mitchell Morrison"},
+ },
+ // A NameInfo with only the full name set overwritten with a NameInfo
+ // with only the name parts set result in a NameInfo with all the name
+ // parts and name full set.
+ OverwriteNameTestCase{
+ {"", "", "", "Marion Mitchell Morrison"},
+ {"Marion", "Mitchell", "Morrison", ""},
+ {"Marion", "Mitchell", "Morrison", "Marion Mitchell Morrison"},
+ },
+ // A NameInfo with only the name parts set overwritten with a NameInfo
+ // with only the full name set result in a NameInfo with all the name
+ // parts and name full set.
+ OverwriteNameTestCase{
+ {"Marion", "Mitchell", "Morrison", ""},
+ {"", "", "", "Marion Mitchell Morrison"},
+ {"Marion", "Mitchell", "Morrison", "Marion Mitchell Morrison"},
+ }));
+
+struct NamePartsAreEmptyTestCase {
+ std::string first;
+ std::string middle;
+ std::string last;
+ std::string full;
+ bool expected_result;
};
- struct TestCase test_cases[] = {
- {"", "", "", "", true},
- {"", "", "", "Marion Mitchell Morrison", true},
- {"Marion", "", "", "", false},
- {"", "Mitchell", "", "", false},
- {"", "", "Morrison", "", false},
- };
-
- for (size_t i = 0; i < arraysize(test_cases); ++i) {
- SCOPED_TRACE(base::StringPrintf("i: %" PRIuS, i));
+ class NamePartsAreEmptyTest
+ : public testing::TestWithParam<NamePartsAreEmptyTestCase> {};
+ TEST_P(NamePartsAreEmptyTest, NamePartsAreEmpty) {
+ auto test_case = GetParam();
// Construct the NameInfo.
NameInfo name;
- name.SetRawInfo(NAME_FIRST, UTF8ToUTF16(test_cases[i].first));
- name.SetRawInfo(NAME_MIDDLE, UTF8ToUTF16(test_cases[i].middle));
- name.SetRawInfo(NAME_LAST, UTF8ToUTF16(test_cases[i].last));
- name.SetRawInfo(NAME_FULL, UTF8ToUTF16(test_cases[i].full));
+ name.SetRawInfo(NAME_FIRST, UTF8ToUTF16(test_case.first));
+ name.SetRawInfo(NAME_MIDDLE, UTF8ToUTF16(test_case.middle));
+ name.SetRawInfo(NAME_LAST, UTF8ToUTF16(test_case.last));
+ name.SetRawInfo(NAME_FULL, UTF8ToUTF16(test_case.full));
// Verify the test expectations.
- EXPECT_EQ(test_cases[i].expected_result, name.NamePartsAreEmpty());
- }
+ EXPECT_EQ(test_case.expected_result, name.NamePartsAreEmpty());
}
+INSTANTIATE_TEST_CASE_P(
+ ContactInfoTest,
+ NamePartsAreEmptyTest,
+ testing::Values(NamePartsAreEmptyTestCase{"", "", "", "", true},
+ NamePartsAreEmptyTestCase{"", "", "",
+ "Marion Mitchell Morrison", true},
+ NamePartsAreEmptyTestCase{"Marion", "", "", "", false},
+ NamePartsAreEmptyTestCase{"", "Mitchell", "", "", false},
+ NamePartsAreEmptyTestCase{"", "", "Morrison", "", false}));
+
} // namespace autofill
« no previous file with comments | « components/autofill/core/browser/autofill_field_unittest.cc ('k') | components/autofill/core/browser/credit_card_field.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698