Skip to content

GitLab

T
tangled
Commit 6e4f7dc4 authored by Jared Saul's avatar Jared Saul Committed by Commit Bot
Browse files
Options

[Autofill] Remove redundant unit test setup 

Rationale:
* We should never need to clear the PersonalDataManager before a test,
  because it shouldn't be created with data anyway (this could disrupt
  tests intended to test merging/deduplication logic/etc.)
* "Credit card upload is enabled" is the default expectation nowadays,
  even though it's still technically only enabled for certain
  countries.  The goal is still to launch it worldwide.  Thus, make it
  the default, and we shouldn't be concerned with turning it on for
  every test, only turning it off in non-standard situations.

Change-Id: I2328cada08d3e219be2f02d7ee0e7dee9526a1db
Reviewed-on: https://chromium-review.googlesource.com/1196104
Commit-Queue: Sebastien Seguin-Gagnon <sebsg@chromium.org>
Reviewed-by: default avatarSebastien Seguin-Gagnon <sebsg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587523}
parent 440a2f96
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 255 deletions
components/autofill/core/browser/credit_card_save_manager_unittest.cc
View file @ 6e4f7dc4
...@@ -117,6 +117,7 @@ class CreditCardSaveManagerTest : public testing::Test { ...@@ -117,6 +117,7 @@ class CreditCardSaveManagerTest : public testing::Test {
credit_card_save_manager_ = credit_card_save_manager_ =
new TestCreditCardSaveManager(autofill_driver_.get(), &autofill_client_, new TestCreditCardSaveManager(autofill_driver_.get(), &autofill_client_,
payments_client_, &personal_data_); payments_client_, &personal_data_);
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
autofill_manager_.reset(new TestAutofillManager( autofill_manager_.reset(new TestAutofillManager(
autofill_driver_.get(), &autofill_client_, &personal_data_, autofill_driver_.get(), &autofill_client_, &personal_data_,
std::unique_ptr<CreditCardSaveManager>(credit_card_save_manager_), std::unique_ptr<CreditCardSaveManager>(credit_card_save_manager_),
...@@ -345,6 +346,7 @@ class CreditCardSaveManagerTest : public testing::Test { ...@@ -345,6 +346,7 @@ class CreditCardSaveManagerTest : public testing::Test {
#define MAYBE_ImportFormDataCreditCardHTTPS ImportFormDataCreditCardHTTPS #define MAYBE_ImportFormDataCreditCardHTTPS ImportFormDataCreditCardHTTPS
#endif #endif
TEST_F(CreditCardSaveManagerTest, MAYBE_ImportFormDataCreditCardHTTPS) { TEST_F(CreditCardSaveManagerTest, MAYBE_ImportFormDataCreditCardHTTPS) {
credit_card_save_manager_->SetCreditCardUploadEnabled(false);
TestSaveCreditCards(true); TestSaveCreditCards(true);
} }
...@@ -356,6 +358,7 @@ TEST_F(CreditCardSaveManagerTest, MAYBE_ImportFormDataCreditCardHTTPS) { ...@@ -356,6 +358,7 @@ TEST_F(CreditCardSaveManagerTest, MAYBE_ImportFormDataCreditCardHTTPS) {
#define MAYBE_ImportFormDataCreditCardHTTP ImportFormDataCreditCardHTTP #define MAYBE_ImportFormDataCreditCardHTTP ImportFormDataCreditCardHTTP
#endif #endif
TEST_F(CreditCardSaveManagerTest, MAYBE_ImportFormDataCreditCardHTTP) { TEST_F(CreditCardSaveManagerTest, MAYBE_ImportFormDataCreditCardHTTP) {
credit_card_save_manager_->SetCreditCardUploadEnabled(false);
TestSaveCreditCards(false); TestSaveCreditCards(false);
} }
...@@ -369,6 +372,8 @@ TEST_F(CreditCardSaveManagerTest, MAYBE_ImportFormDataCreditCardHTTP) { ...@@ -369,6 +372,8 @@ TEST_F(CreditCardSaveManagerTest, MAYBE_ImportFormDataCreditCardHTTP) {
CreditCardSavedWhenAutocompleteOff CreditCardSavedWhenAutocompleteOff
#endif #endif
TEST_F(CreditCardSaveManagerTest, MAYBE_CreditCardSavedWhenAutocompleteOff) { TEST_F(CreditCardSaveManagerTest, MAYBE_CreditCardSavedWhenAutocompleteOff) {
credit_card_save_manager_->SetCreditCardUploadEnabled(false);
// Set up our form data. // Set up our form data.
FormData form; FormData form;
CreateTestCreditCardFormData(&form, false, false); CreateTestCreditCardFormData(&form, false, false);
...@@ -407,7 +412,6 @@ TEST_F(CreditCardSaveManagerTest, InvalidCreditCardNumberIsNotSaved) { ...@@ -407,7 +412,6 @@ TEST_F(CreditCardSaveManagerTest, InvalidCreditCardNumberIsNotSaved) {
} }
TEST_F(CreditCardSaveManagerTest, CreditCardDisabledDoesNotSave) { TEST_F(CreditCardSaveManagerTest, CreditCardDisabledDoesNotSave) {
personal_data_.ClearProfiles();
autofill_manager_->SetCreditCardEnabled(false); autofill_manager_->SetCreditCardEnabled(false);
// Create, fill and submit an address form in order to establish a recent // Create, fill and submit an address form in order to establish a recent
...@@ -444,9 +448,6 @@ TEST_F(CreditCardSaveManagerTest, CreditCardDisabledDoesNotSave) { ...@@ -444,9 +448,6 @@ TEST_F(CreditCardSaveManagerTest, CreditCardDisabledDoesNotSave) {
TEST_F(CreditCardSaveManagerTest, UploadCreditCard_FullAddresses) { TEST_F(CreditCardSaveManagerTest, UploadCreditCard_FullAddresses) {
scoped_feature_list_.InitAndDisableFeature( scoped_feature_list_.InitAndDisableFeature(
features::kAutofillSendOnlyCountryInGetUploadDetails); features::kAutofillSendOnlyCountryInGetUploadDetails);
personal_data_.ClearCreditCards();
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Create, fill and submit an address form in order to establish a recent // Create, fill and submit an address form in order to establish a recent
// profile which can be selected for the upload request. // profile which can be selected for the upload request.
...@@ -509,9 +510,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_OnlyCountryInAddresses) { ...@@ -509,9 +510,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_OnlyCountryInAddresses) {
// details request will only contain the country. // details request will only contain the country.
scoped_feature_list_.InitAndEnableFeature( scoped_feature_list_.InitAndEnableFeature(
features::kAutofillSendOnlyCountryInGetUploadDetails); features::kAutofillSendOnlyCountryInGetUploadDetails);
personal_data_.ClearCreditCards();
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Create, fill and submit an address form in order to establish a recent // Create, fill and submit an address form in order to establish a recent
// profile which can be selected for the upload request. // profile which can be selected for the upload request.
...@@ -576,10 +574,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_OnlyCountryInAddresses) { ...@@ -576,10 +574,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_OnlyCountryInAddresses) {
// Tests that a credit card inferred from a form with a credit card first and // Tests that a credit card inferred from a form with a credit card first and
// last name can be uploaded. // last name can be uploaded.
TEST_F(CreditCardSaveManagerTest, UploadCreditCard_FirstAndLastName) { TEST_F(CreditCardSaveManagerTest, UploadCreditCard_FirstAndLastName) {
personal_data_.ClearCreditCards();
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Create, fill and submit an address form in order to establish a recent // Create, fill and submit an address form in order to establish a recent
// profile which can be selected for the upload request. // profile which can be selected for the upload request.
FormData address_form; FormData address_form;
...@@ -640,10 +634,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_FirstAndLastName) { ...@@ -640,10 +634,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_FirstAndLastName) {
// last name can be uploaded when the last name comes before first name on the // last name can be uploaded when the last name comes before first name on the
// form. // form.
TEST_F(CreditCardSaveManagerTest, UploadCreditCard_LastAndFirstName) { TEST_F(CreditCardSaveManagerTest, UploadCreditCard_LastAndFirstName) {
personal_data_.ClearCreditCards();
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Create, fill and submit an address form in order to establish a recent // Create, fill and submit an address form in order to establish a recent
// profile which can be selected for the upload request. // profile which can be selected for the upload request.
FormData address_form; FormData address_form;
...@@ -723,9 +713,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_LastAndFirstName) { ...@@ -723,9 +713,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_LastAndFirstName) {
} }
TEST_F(CreditCardSaveManagerTest, UploadCreditCardAndSaveCopy) { TEST_F(CreditCardSaveManagerTest, UploadCreditCardAndSaveCopy) {
personal_data_.ClearCreditCards();
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
scoped_feature_list_.InitAndDisableFeature( scoped_feature_list_.InitAndDisableFeature(
features::kAutofillNoLocalSaveOnUploadSuccess); features::kAutofillNoLocalSaveOnUploadSuccess);
...@@ -816,7 +803,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_DisableLocalSave) { ...@@ -816,7 +803,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_DisableLocalSave) {
} }
TEST_F(CreditCardSaveManagerTest, UploadCreditCard_FeatureNotEnabled) { TEST_F(CreditCardSaveManagerTest, UploadCreditCard_FeatureNotEnabled) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(false); credit_card_save_manager_->SetCreditCardUploadEnabled(false);
// Create, fill and submit an address form in order to establish a recent // Create, fill and submit an address form in order to establish a recent
...@@ -851,9 +837,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_FeatureNotEnabled) { ...@@ -851,9 +837,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_FeatureNotEnabled) {
} }
TEST_F(CreditCardSaveManagerTest, UploadCreditCard_CvcUnavailable) { TEST_F(CreditCardSaveManagerTest, UploadCreditCard_CvcUnavailable) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Create, fill and submit an address form in order to establish a recent // Create, fill and submit an address form in order to establish a recent
// profile which can be selected for the upload request. // profile which can be selected for the upload request.
FormData address_form; FormData address_form;
...@@ -895,9 +878,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_CvcUnavailable) { ...@@ -895,9 +878,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_CvcUnavailable) {
} }
TEST_F(CreditCardSaveManagerTest, UploadCreditCard_CvcInvalidLength) { TEST_F(CreditCardSaveManagerTest, UploadCreditCard_CvcInvalidLength) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Create, fill and submit an address form in order to establish a recent // Create, fill and submit an address form in order to establish a recent
// profile which can be selected for the upload request. // profile which can be selected for the upload request.
FormData address_form; FormData address_form;
...@@ -936,13 +916,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_CvcInvalidLength) { ...@@ -936,13 +916,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_CvcInvalidLength) {
} }
TEST_F(CreditCardSaveManagerTest, UploadCreditCard_MultipleCvcFields) { TEST_F(CreditCardSaveManagerTest, UploadCreditCard_MultipleCvcFields) {
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Remove the profiles that were created in the TestPersonalDataManager
// constructor because they would result in conflicting names that would
// prevent the upload.
personal_data_.ClearProfiles();
// Create, fill and submit an address form in order to establish a recent // Create, fill and submit an address form in order to establish a recent
// profile which can be selected for the upload request. // profile which can be selected for the upload request.
FormData address_form; FormData address_form;
...@@ -998,13 +971,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_MultipleCvcFields) { ...@@ -998,13 +971,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_MultipleCvcFields) {
} }
TEST_F(CreditCardSaveManagerTest, UploadCreditCard_NoCvcFieldOnForm) { TEST_F(CreditCardSaveManagerTest, UploadCreditCard_NoCvcFieldOnForm) {
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Remove the profiles that were created in the TestPersonalDataManager
// constructor because they would result in conflicting names that would
// prevent the upload.
personal_data_.ClearProfiles();
// Create, fill and submit an address form in order to establish a recent // Create, fill and submit an address form in order to establish a recent
// profile which can be selected for the upload request. // profile which can be selected for the upload request.
FormData address_form; FormData address_form;
...@@ -1058,13 +1024,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_NoCvcFieldOnForm) { ...@@ -1058,13 +1024,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_NoCvcFieldOnForm) {
TEST_F(CreditCardSaveManagerTest, TEST_F(CreditCardSaveManagerTest,
UploadCreditCard_NoCvcFieldOnForm_InvalidCvcInNonCvcField) { UploadCreditCard_NoCvcFieldOnForm_InvalidCvcInNonCvcField) {
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Remove the profiles that were created in the TestPersonalDataManager
// constructor because they would result in conflicting names that would
// prevent the upload.
personal_data_.ClearProfiles();
// Create, fill and submit an address form in order to establish a recent // Create, fill and submit an address form in order to establish a recent
// profile which can be selected for the upload request. // profile which can be selected for the upload request.
FormData address_form; FormData address_form;
...@@ -1121,13 +1080,6 @@ TEST_F(CreditCardSaveManagerTest, ...@@ -1121,13 +1080,6 @@ TEST_F(CreditCardSaveManagerTest,
TEST_F(CreditCardSaveManagerTest, TEST_F(CreditCardSaveManagerTest,
UploadCreditCard_NoCvcFieldOnForm_CvcInNonCvcField) { UploadCreditCard_NoCvcFieldOnForm_CvcInNonCvcField) {
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Remove the profiles that were created in the TestPersonalDataManager
// constructor because they would result in conflicting names that would
// prevent the upload.
personal_data_.ClearProfiles();
// Create, fill and submit an address form in order to establish a recent // Create, fill and submit an address form in order to establish a recent
// profile which can be selected for the upload request. // profile which can be selected for the upload request.
FormData address_form; FormData address_form;
...@@ -1186,13 +1138,6 @@ TEST_F(CreditCardSaveManagerTest, ...@@ -1186,13 +1138,6 @@ TEST_F(CreditCardSaveManagerTest,
TEST_F(CreditCardSaveManagerTest, TEST_F(CreditCardSaveManagerTest,
UploadCreditCard_NoCvcFieldOnForm_CvcInAddressField) { UploadCreditCard_NoCvcFieldOnForm_CvcInAddressField) {
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Remove the profiles that were created in the TestPersonalDataManager
// constructor because they would result in conflicting names that would
// prevent the upload.
personal_data_.ClearProfiles();
// Create, fill and submit an address form in order to establish a recent // Create, fill and submit an address form in order to establish a recent
// profile which can be selected for the upload request. // profile which can be selected for the upload request.
FormData address_form; FormData address_form;
...@@ -1248,9 +1193,6 @@ TEST_F(CreditCardSaveManagerTest, ...@@ -1248,9 +1193,6 @@ TEST_F(CreditCardSaveManagerTest,
} }
TEST_F(CreditCardSaveManagerTest, UploadCreditCard_NoProfileAvailable) { TEST_F(CreditCardSaveManagerTest, UploadCreditCard_NoProfileAvailable) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Don't fill or submit an address form. // Don't fill or submit an address form.
// Set up our credit card form data. // Set up our credit card form data.
...@@ -1288,9 +1230,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_NoRecentlyUsedProfile) { ...@@ -1288,9 +1230,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_NoRecentlyUsedProfile) {
TestAutofillClock test_clock; TestAutofillClock test_clock;
test_clock.SetNow(kArbitraryTime); test_clock.SetNow(kArbitraryTime);
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Create, fill and submit an address form in order to establish a profile. // Create, fill and submit an address form in order to establish a profile.
FormData address_form; FormData address_form;
test::CreateTestAddressFormData(&address_form); test::CreateTestAddressFormData(&address_form);
...@@ -1338,9 +1277,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_NoRecentlyUsedProfile) { ...@@ -1338,9 +1277,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_NoRecentlyUsedProfile) {
TEST_F(CreditCardSaveManagerTest, TEST_F(CreditCardSaveManagerTest,
UploadCreditCard_CvcUnavailableAndNoProfileAvailable) { UploadCreditCard_CvcUnavailableAndNoProfileAvailable) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Don't fill or submit an address form. // Don't fill or submit an address form.
// Set up our credit card form data. // Set up our credit card form data.
...@@ -1376,9 +1312,6 @@ TEST_F(CreditCardSaveManagerTest, ...@@ -1376,9 +1312,6 @@ TEST_F(CreditCardSaveManagerTest,
} }
TEST_F(CreditCardSaveManagerTest, UploadCreditCard_NoNameAvailable) { TEST_F(CreditCardSaveManagerTest, UploadCreditCard_NoNameAvailable) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Create, fill and submit an address form in order to establish a recent // Create, fill and submit an address form in order to establish a recent
// profile which can be selected for the upload request. // profile which can be selected for the upload request.
FormData address_form; FormData address_form;
...@@ -1418,9 +1351,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_NoNameAvailable) { ...@@ -1418,9 +1351,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_NoNameAvailable) {
TEST_F(CreditCardSaveManagerTest, TEST_F(CreditCardSaveManagerTest,
UploadCreditCard_NoNameAvailableAndNoProfileAvailable) { UploadCreditCard_NoNameAvailableAndNoProfileAvailable) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Don't fill or submit an address form. // Don't fill or submit an address form.
// Set up our credit card form data. // Set up our credit card form data.
...@@ -1456,9 +1386,6 @@ TEST_F(CreditCardSaveManagerTest, ...@@ -1456,9 +1386,6 @@ TEST_F(CreditCardSaveManagerTest,
} }
TEST_F(CreditCardSaveManagerTest, UploadCreditCard_ZipCodesConflict) { TEST_F(CreditCardSaveManagerTest, UploadCreditCard_ZipCodesConflict) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Create, fill and submit two address forms with different zip codes. // Create, fill and submit two address forms with different zip codes.
FormData address_form1, address_form2; FormData address_form1, address_form2;
test::CreateTestAddressFormData(&address_form1, "1"); test::CreateTestAddressFormData(&address_form1, "1");
...@@ -1509,9 +1436,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_ZipCodesConflict) { ...@@ -1509,9 +1436,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_ZipCodesConflict) {
TEST_F(CreditCardSaveManagerTest, TEST_F(CreditCardSaveManagerTest,
UploadCreditCard_ZipCodesDoNotDiscardWhitespace) { UploadCreditCard_ZipCodesDoNotDiscardWhitespace) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Create two separate profiles with different zip codes. Must directly add // Create two separate profiles with different zip codes. Must directly add
// instead of submitting a form, because they're deduped on form submit. // instead of submitting a form, because they're deduped on form submit.
AutofillProfile profile1; AutofillProfile profile1;
...@@ -1559,9 +1483,6 @@ TEST_F(CreditCardSaveManagerTest, ...@@ -1559,9 +1483,6 @@ TEST_F(CreditCardSaveManagerTest,
} }
TEST_F(CreditCardSaveManagerTest, UploadCreditCard_ZipCodesHavePrefixMatch) { TEST_F(CreditCardSaveManagerTest, UploadCreditCard_ZipCodesHavePrefixMatch) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Create, fill and submit two address forms with different zip codes. // Create, fill and submit two address forms with different zip codes.
FormData address_form1, address_form2; FormData address_form1, address_form2;
test::CreateTestAddressFormData(&address_form1); test::CreateTestAddressFormData(&address_form1);
...@@ -1605,9 +1526,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_ZipCodesHavePrefixMatch) { ...@@ -1605,9 +1526,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_ZipCodesHavePrefixMatch) {
} }
TEST_F(CreditCardSaveManagerTest, UploadCreditCard_NoZipCodeAvailable) { TEST_F(CreditCardSaveManagerTest, UploadCreditCard_NoZipCodeAvailable) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Create, fill and submit an address form in order to establish a recent // Create, fill and submit an address form in order to establish a recent
// profile which can be selected for the upload request. // profile which can be selected for the upload request.
FormData address_form; FormData address_form;
...@@ -1653,9 +1571,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_NoZipCodeAvailable) { ...@@ -1653,9 +1571,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_NoZipCodeAvailable) {
} }
TEST_F(CreditCardSaveManagerTest, UploadCreditCard_CCFormHasMiddleInitial) { TEST_F(CreditCardSaveManagerTest, UploadCreditCard_CCFormHasMiddleInitial) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Create, fill and submit two address forms with different names. // Create, fill and submit two address forms with different names.
FormData address_form1, address_form2; FormData address_form1, address_form2;
test::CreateTestAddressFormData(&address_form1); test::CreateTestAddressFormData(&address_form1);
...@@ -1698,9 +1613,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_CCFormHasMiddleInitial) { ...@@ -1698,9 +1613,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_CCFormHasMiddleInitial) {
} }
TEST_F(CreditCardSaveManagerTest, UploadCreditCard_NoMiddleInitialInCCForm) { TEST_F(CreditCardSaveManagerTest, UploadCreditCard_NoMiddleInitialInCCForm) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Create, fill and submit two address forms with different names. // Create, fill and submit two address forms with different names.
FormData address_form1, address_form2; FormData address_form1, address_form2;
test::CreateTestAddressFormData(&address_form1); test::CreateTestAddressFormData(&address_form1);
...@@ -1741,9 +1653,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_NoMiddleInitialInCCForm) { ...@@ -1741,9 +1653,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_NoMiddleInitialInCCForm) {
TEST_F(CreditCardSaveManagerTest, TEST_F(CreditCardSaveManagerTest,
UploadCreditCard_CCFormHasCardholderMiddleName) { UploadCreditCard_CCFormHasCardholderMiddleName) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Create, fill and submit address form without middle name. // Create, fill and submit address form without middle name.
FormData address_form; FormData address_form;
test::CreateTestAddressFormData(&address_form); test::CreateTestAddressFormData(&address_form);
...@@ -1782,9 +1691,6 @@ TEST_F(CreditCardSaveManagerTest, ...@@ -1782,9 +1691,6 @@ TEST_F(CreditCardSaveManagerTest,
} }
TEST_F(CreditCardSaveManagerTest, UploadCreditCard_CCFormHasAddressMiddleName) { TEST_F(CreditCardSaveManagerTest, UploadCreditCard_CCFormHasAddressMiddleName) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Create, fill and submit address form with middle name. // Create, fill and submit address form with middle name.
FormData address_form; FormData address_form;
test::CreateTestAddressFormData(&address_form); test::CreateTestAddressFormData(&address_form);
...@@ -1823,9 +1729,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_CCFormHasAddressMiddleName) { ...@@ -1823,9 +1729,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_CCFormHasAddressMiddleName) {
} }
TEST_F(CreditCardSaveManagerTest, UploadCreditCard_NamesCanMismatch) { TEST_F(CreditCardSaveManagerTest, UploadCreditCard_NamesCanMismatch) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Create, fill and submit two address forms with different names. // Create, fill and submit two address forms with different names.
FormData address_form1, address_form2; FormData address_form1, address_form2;
test::CreateTestAddressFormData(&address_form1); test::CreateTestAddressFormData(&address_form1);
...@@ -1877,9 +1780,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_IgnoreOldProfiles) { ...@@ -1877,9 +1780,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_IgnoreOldProfiles) {
TestAutofillClock test_clock; TestAutofillClock test_clock;
test_clock.SetNow(kArbitraryTime); test_clock.SetNow(kArbitraryTime);
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Create, fill and submit two address forms with different names. // Create, fill and submit two address forms with different names.
FormData address_form1, address_form2; FormData address_form1, address_form2;
test::CreateTestAddressFormData(&address_form1); test::CreateTestAddressFormData(&address_form1);
...@@ -1927,8 +1827,6 @@ TEST_F( ...@@ -1927,8 +1827,6 @@ TEST_F(
UploadCreditCard_RequestCardholderNameIfNameMissingAndNoPaymentsCustomer) { UploadCreditCard_RequestCardholderNameIfNameMissingAndNoPaymentsCustomer) {
scoped_feature_list_.InitAndEnableFeature( scoped_feature_list_.InitAndEnableFeature(
features::kAutofillUpstreamEditableCardholderName); features::kAutofillUpstreamEditableCardholderName);
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Create, fill and submit an address form in order to establish a recent // Create, fill and submit an address form in order to establish a recent
// profile which can be selected for the upload request. // profile which can be selected for the upload request.
...@@ -1972,8 +1870,6 @@ TEST_F( ...@@ -1972,8 +1870,6 @@ TEST_F(
UploadCreditCard_RequestCardholderNameIfNameConflictingAndNoPaymentsCustomer) { UploadCreditCard_RequestCardholderNameIfNameConflictingAndNoPaymentsCustomer) {
scoped_feature_list_.InitAndEnableFeature( scoped_feature_list_.InitAndEnableFeature(
features::kAutofillUpstreamEditableCardholderName); features::kAutofillUpstreamEditableCardholderName);
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Create, fill and submit an address form in order to establish a recent // Create, fill and submit an address form in order to establish a recent
// profile which can be selected for the upload request. // profile which can be selected for the upload request.
...@@ -2017,8 +1913,6 @@ TEST_F( ...@@ -2017,8 +1913,6 @@ TEST_F(
UploadCreditCard_DoNotRequestCardholderNameIfNameExistsAndNoPaymentsCustomer) { UploadCreditCard_DoNotRequestCardholderNameIfNameExistsAndNoPaymentsCustomer) {
scoped_feature_list_.InitAndEnableFeature( scoped_feature_list_.InitAndEnableFeature(
features::kAutofillUpstreamEditableCardholderName); features::kAutofillUpstreamEditableCardholderName);
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Create, fill and submit an address form in order to establish a recent // Create, fill and submit an address form in order to establish a recent
// profile which can be selected for the upload request. // profile which can be selected for the upload request.
...@@ -2060,8 +1954,6 @@ TEST_F( ...@@ -2060,8 +1954,6 @@ TEST_F(
UploadCreditCard_DoNotRequestCardholderNameIfNameMissingAndPaymentsCustomer) { UploadCreditCard_DoNotRequestCardholderNameIfNameMissingAndPaymentsCustomer) {
scoped_feature_list_.InitAndEnableFeature( scoped_feature_list_.InitAndEnableFeature(
features::kAutofillUpstreamEditableCardholderName); features::kAutofillUpstreamEditableCardholderName);
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set the billing_customer_number Priority Preference to designate existence // Set the billing_customer_number Priority Preference to designate existence
// of a Payments account. // of a Payments account.
...@@ -2110,8 +2002,6 @@ TEST_F( ...@@ -2110,8 +2002,6 @@ TEST_F(
UploadCreditCard_DoNotRequestCardholderNameIfNameConflictingAndPaymentsCustomer) { UploadCreditCard_DoNotRequestCardholderNameIfNameConflictingAndPaymentsCustomer) {
scoped_feature_list_.InitAndEnableFeature( scoped_feature_list_.InitAndEnableFeature(
features::kAutofillUpstreamEditableCardholderName); features::kAutofillUpstreamEditableCardholderName);
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set the billing_customer_number Priority Preference to designate existence // Set the billing_customer_number Priority Preference to designate existence
// of a Payments account. // of a Payments account.
...@@ -2160,8 +2050,6 @@ TEST_F( ...@@ -2160,8 +2050,6 @@ TEST_F(
UploadCreditCard_DoNotRequestCardholderNameIfNameMissingAndNoPaymentsCustomerExpOff) { UploadCreditCard_DoNotRequestCardholderNameIfNameMissingAndNoPaymentsCustomerExpOff) {
scoped_feature_list_.InitAndDisableFeature( scoped_feature_list_.InitAndDisableFeature(
features::kAutofillUpstreamEditableCardholderName); features::kAutofillUpstreamEditableCardholderName);
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Create, fill and submit an address form in order to establish a recent // Create, fill and submit an address form in order to establish a recent
// profile which can be selected for the upload request. // profile which can be selected for the upload request.
...@@ -2205,8 +2093,6 @@ TEST_F( ...@@ -2205,8 +2093,6 @@ TEST_F(
UploadCreditCard_DoNotRequestCardholderNameIfNameConflictingAndNoPaymentsCustomerExpOff) { UploadCreditCard_DoNotRequestCardholderNameIfNameConflictingAndNoPaymentsCustomerExpOff) {
scoped_feature_list_.InitAndDisableFeature( scoped_feature_list_.InitAndDisableFeature(
features::kAutofillUpstreamEditableCardholderName); features::kAutofillUpstreamEditableCardholderName);
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Create, fill and submit an address form in order to establish a recent // Create, fill and submit an address form in order to establish a recent
// profile which can be selected for the upload request. // profile which can be selected for the upload request.
...@@ -2252,8 +2138,6 @@ TEST_F( ...@@ -2252,8 +2138,6 @@ TEST_F(
UploadCreditCard_ShouldRequestCardholderName_ResetBetweenConsecutiveSaves) { UploadCreditCard_ShouldRequestCardholderName_ResetBetweenConsecutiveSaves) {
scoped_feature_list_.InitAndEnableFeature( scoped_feature_list_.InitAndEnableFeature(
features::kAutofillUpstreamEditableCardholderName); features::kAutofillUpstreamEditableCardholderName);
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Create, fill and submit an address form in order to establish a recent // Create, fill and submit an address form in order to establish a recent
// profile which can be selected for the upload request. // profile which can be selected for the upload request.
...@@ -2302,8 +2186,6 @@ TEST_F(CreditCardSaveManagerTest, ...@@ -2302,8 +2186,6 @@ TEST_F(CreditCardSaveManagerTest,
UploadCreditCard_RequestCardholderNameIfTestingExperimentOn) { UploadCreditCard_RequestCardholderNameIfTestingExperimentOn) {
scoped_feature_list_.InitAndEnableFeature( scoped_feature_list_.InitAndEnableFeature(
features::kAutofillUpstreamAlwaysRequestCardholderName); features::kAutofillUpstreamAlwaysRequestCardholderName);
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Create, fill and submit an address form in order to establish a recent // Create, fill and submit an address form in order to establish a recent
// profile which can be selected for the upload request. // profile which can be selected for the upload request.
...@@ -2348,9 +2230,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_LogPreviousUseDate) { ...@@ -2348,9 +2230,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_LogPreviousUseDate) {
TestAutofillClock test_clock; TestAutofillClock test_clock;
test_clock.SetNow(kArbitraryTime); test_clock.SetNow(kArbitraryTime);
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Create, fill and submit an address form in order to establish a recent // Create, fill and submit an address form in order to establish a recent
// profile which can be selected for the upload request. // profile which can be selected for the upload request.
FormData address_form; FormData address_form;
...@@ -2392,9 +2271,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_LogPreviousUseDate) { ...@@ -2392,9 +2271,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_LogPreviousUseDate) {
} }
TEST_F(CreditCardSaveManagerTest, UploadCreditCard_UploadDetailsFails) { TEST_F(CreditCardSaveManagerTest, UploadCreditCard_UploadDetailsFails) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Anything other than "en-US" will cause GetUploadDetails to return a failure // Anything other than "en-US" will cause GetUploadDetails to return a failure
// response. // response.
credit_card_save_manager_->SetAppLocale("pt-BR"); credit_card_save_manager_->SetAppLocale("pt-BR");
...@@ -2436,10 +2312,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_UploadDetailsFails) { ...@@ -2436,10 +2312,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_UploadDetailsFails) {
} }
TEST_F(CreditCardSaveManagerTest, DuplicateMaskedCreditCard_NoUpload) { TEST_F(CreditCardSaveManagerTest, DuplicateMaskedCreditCard_NoUpload) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
credit_card_save_manager_->SetAppLocale("en-US");
// Create, fill and submit an address form in order to establish a recent // Create, fill and submit an address form in order to establish a recent
// profile which can be selected for the upload request. // profile which can be selected for the upload request.
FormData address_form; FormData address_form;
...@@ -2476,9 +2348,6 @@ TEST_F(CreditCardSaveManagerTest, DuplicateMaskedCreditCard_NoUpload) { ...@@ -2476,9 +2348,6 @@ TEST_F(CreditCardSaveManagerTest, DuplicateMaskedCreditCard_NoUpload) {
} }
TEST_F(CreditCardSaveManagerTest, GetDetectedValues_NothingIfNothingFound) { TEST_F(CreditCardSaveManagerTest, GetDetectedValues_NothingIfNothingFound) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set up our credit card form data. // Set up our credit card form data.
FormData credit_card_form; FormData credit_card_form;
CreateTestCreditCardFormData(&credit_card_form, true, false); CreateTestCreditCardFormData(&credit_card_form, true, false);
...@@ -2497,9 +2366,6 @@ TEST_F(CreditCardSaveManagerTest, GetDetectedValues_NothingIfNothingFound) { ...@@ -2497,9 +2366,6 @@ TEST_F(CreditCardSaveManagerTest, GetDetectedValues_NothingIfNothingFound) {
} }
TEST_F(CreditCardSaveManagerTest, GetDetectedValues_DetectCvc) { TEST_F(CreditCardSaveManagerTest, GetDetectedValues_DetectCvc) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set up our credit card form data. // Set up our credit card form data.
FormData credit_card_form; FormData credit_card_form;
CreateTestCreditCardFormData(&credit_card_form, true, false); CreateTestCreditCardFormData(&credit_card_form, true, false);
...@@ -2519,9 +2385,6 @@ TEST_F(CreditCardSaveManagerTest, GetDetectedValues_DetectCvc) { ...@@ -2519,9 +2385,6 @@ TEST_F(CreditCardSaveManagerTest, GetDetectedValues_DetectCvc) {
} }
TEST_F(CreditCardSaveManagerTest, GetDetectedValues_DetectCardholderName) { TEST_F(CreditCardSaveManagerTest, GetDetectedValues_DetectCardholderName) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set up our credit card form data. // Set up our credit card form data.
FormData credit_card_form; FormData credit_card_form;
CreateTestCreditCardFormData(&credit_card_form, true, false); CreateTestCreditCardFormData(&credit_card_form, true, false);
...@@ -2541,9 +2404,6 @@ TEST_F(CreditCardSaveManagerTest, GetDetectedValues_DetectCardholderName) { ...@@ -2541,9 +2404,6 @@ TEST_F(CreditCardSaveManagerTest, GetDetectedValues_DetectCardholderName) {
} }
TEST_F(CreditCardSaveManagerTest, GetDetectedValues_DetectAddressName) { TEST_F(CreditCardSaveManagerTest, GetDetectedValues_DetectAddressName) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set up a new address profile. // Set up a new address profile.
AutofillProfile profile; AutofillProfile profile;
profile.set_guid("00000000-0000-0000-0000-000000000200"); profile.set_guid("00000000-0000-0000-0000-000000000200");
...@@ -2570,9 +2430,6 @@ TEST_F(CreditCardSaveManagerTest, GetDetectedValues_DetectAddressName) { ...@@ -2570,9 +2430,6 @@ TEST_F(CreditCardSaveManagerTest, GetDetectedValues_DetectAddressName) {
TEST_F(CreditCardSaveManagerTest, TEST_F(CreditCardSaveManagerTest,
GetDetectedValues_DetectCardholderAndAddressNameIfMatching) { GetDetectedValues_DetectCardholderAndAddressNameIfMatching) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set up a new address profile. // Set up a new address profile.
AutofillProfile profile; AutofillProfile profile;
profile.set_guid("00000000-0000-0000-0000-000000000200"); profile.set_guid("00000000-0000-0000-0000-000000000200");
...@@ -2600,9 +2457,6 @@ TEST_F(CreditCardSaveManagerTest, ...@@ -2600,9 +2457,6 @@ TEST_F(CreditCardSaveManagerTest,
TEST_F(CreditCardSaveManagerTest, TEST_F(CreditCardSaveManagerTest,
GetDetectedValues_DetectNoUniqueNameIfNamesConflict) { GetDetectedValues_DetectNoUniqueNameIfNamesConflict) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set up a new address profile. // Set up a new address profile.
AutofillProfile profile; AutofillProfile profile;
profile.set_guid("00000000-0000-0000-0000-000000000200"); profile.set_guid("00000000-0000-0000-0000-000000000200");
...@@ -2627,9 +2481,6 @@ TEST_F(CreditCardSaveManagerTest, ...@@ -2627,9 +2481,6 @@ TEST_F(CreditCardSaveManagerTest,
} }
TEST_F(CreditCardSaveManagerTest, GetDetectedValues_DetectPostalCode) { TEST_F(CreditCardSaveManagerTest, GetDetectedValues_DetectPostalCode) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set up a new address profile. // Set up a new address profile.
AutofillProfile profile; AutofillProfile profile;
profile.set_guid("00000000-0000-0000-0000-000000000200"); profile.set_guid("00000000-0000-0000-0000-000000000200");
...@@ -2656,9 +2507,6 @@ TEST_F(CreditCardSaveManagerTest, GetDetectedValues_DetectPostalCode) { ...@@ -2656,9 +2507,6 @@ TEST_F(CreditCardSaveManagerTest, GetDetectedValues_DetectPostalCode) {
TEST_F(CreditCardSaveManagerTest, TEST_F(CreditCardSaveManagerTest,
GetDetectedValues_DetectNoUniquePostalCodeIfZipsConflict) { GetDetectedValues_DetectNoUniquePostalCodeIfZipsConflict) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set up two new address profiles with conflicting postal codes. // Set up two new address profiles with conflicting postal codes.
AutofillProfile profile1; AutofillProfile profile1;
profile1.set_guid("00000000-0000-0000-0000-000000000200"); profile1.set_guid("00000000-0000-0000-0000-000000000200");
...@@ -2687,9 +2535,6 @@ TEST_F(CreditCardSaveManagerTest, ...@@ -2687,9 +2535,6 @@ TEST_F(CreditCardSaveManagerTest,
} }
TEST_F(CreditCardSaveManagerTest, GetDetectedValues_DetectAddressLine) { TEST_F(CreditCardSaveManagerTest, GetDetectedValues_DetectAddressLine) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set up a new address profile. // Set up a new address profile.
AutofillProfile profile; AutofillProfile profile;
profile.set_guid("00000000-0000-0000-0000-000000000200"); profile.set_guid("00000000-0000-0000-0000-000000000200");
...@@ -2715,9 +2560,6 @@ TEST_F(CreditCardSaveManagerTest, GetDetectedValues_DetectAddressLine) { ...@@ -2715,9 +2560,6 @@ TEST_F(CreditCardSaveManagerTest, GetDetectedValues_DetectAddressLine) {
} }
TEST_F(CreditCardSaveManagerTest, GetDetectedValues_DetectLocality) { TEST_F(CreditCardSaveManagerTest, GetDetectedValues_DetectLocality) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set up a new address profile. // Set up a new address profile.
AutofillProfile profile; AutofillProfile profile;
profile.set_guid("00000000-0000-0000-0000-000000000200"); profile.set_guid("00000000-0000-0000-0000-000000000200");
...@@ -2743,9 +2585,6 @@ TEST_F(CreditCardSaveManagerTest, GetDetectedValues_DetectLocality) { ...@@ -2743,9 +2585,6 @@ TEST_F(CreditCardSaveManagerTest, GetDetectedValues_DetectLocality) {
} }
TEST_F(CreditCardSaveManagerTest, GetDetectedValues_DetectAdministrativeArea) { TEST_F(CreditCardSaveManagerTest, GetDetectedValues_DetectAdministrativeArea) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set up a new address profile. // Set up a new address profile.
AutofillProfile profile; AutofillProfile profile;
profile.set_guid("00000000-0000-0000-0000-000000000200"); profile.set_guid("00000000-0000-0000-0000-000000000200");
...@@ -2771,9 +2610,6 @@ TEST_F(CreditCardSaveManagerTest, GetDetectedValues_DetectAdministrativeArea) { ...@@ -2771,9 +2610,6 @@ TEST_F(CreditCardSaveManagerTest, GetDetectedValues_DetectAdministrativeArea) {
} }
TEST_F(CreditCardSaveManagerTest, GetDetectedValues_DetectCountryCode) { TEST_F(CreditCardSaveManagerTest, GetDetectedValues_DetectCountryCode) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set up a new address profile. // Set up a new address profile.
AutofillProfile profile; AutofillProfile profile;
profile.set_guid("00000000-0000-0000-0000-000000000200"); profile.set_guid("00000000-0000-0000-0000-000000000200");
...@@ -2800,9 +2636,6 @@ TEST_F(CreditCardSaveManagerTest, GetDetectedValues_DetectCountryCode) { ...@@ -2800,9 +2636,6 @@ TEST_F(CreditCardSaveManagerTest, GetDetectedValues_DetectCountryCode) {
TEST_F(CreditCardSaveManagerTest, TEST_F(CreditCardSaveManagerTest,
GetDetectedValues_DetectHasGooglePaymentAccount) { GetDetectedValues_DetectHasGooglePaymentAccount) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set the billing_customer_number Priority Preference to designate existence // Set the billing_customer_number Priority Preference to designate existence
// of a Payments account. // of a Payments account.
autofill_client_.GetPrefs()->SetDouble(prefs::kAutofillBillingCustomerNumber, autofill_client_.GetPrefs()->SetDouble(prefs::kAutofillBillingCustomerNumber,
...@@ -2827,9 +2660,6 @@ TEST_F(CreditCardSaveManagerTest, ...@@ -2827,9 +2660,6 @@ TEST_F(CreditCardSaveManagerTest,
} }
TEST_F(CreditCardSaveManagerTest, GetDetectedValues_DetectEverythingAtOnce) { TEST_F(CreditCardSaveManagerTest, GetDetectedValues_DetectEverythingAtOnce) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set up a new address profile. // Set up a new address profile.
AutofillProfile profile; AutofillProfile profile;
profile.set_guid("00000000-0000-0000-0000-000000000200"); profile.set_guid("00000000-0000-0000-0000-000000000200");
...@@ -2868,9 +2698,6 @@ TEST_F(CreditCardSaveManagerTest, GetDetectedValues_DetectEverythingAtOnce) { ...@@ -2868,9 +2698,6 @@ TEST_F(CreditCardSaveManagerTest, GetDetectedValues_DetectEverythingAtOnce) {
TEST_F(CreditCardSaveManagerTest, TEST_F(CreditCardSaveManagerTest,
GetDetectedValues_DetectSubsetOfPossibleFields) { GetDetectedValues_DetectSubsetOfPossibleFields) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set up a new address profile, taking out address line and state. // Set up a new address profile, taking out address line and state.
AutofillProfile profile; AutofillProfile profile;
profile.set_guid("00000000-0000-0000-0000-000000000200"); profile.set_guid("00000000-0000-0000-0000-000000000200");
...@@ -2906,9 +2733,6 @@ TEST_F(CreditCardSaveManagerTest, ...@@ -2906,9 +2733,6 @@ TEST_F(CreditCardSaveManagerTest,
// populated if even one address profile contains it. // populated if even one address profile contains it.
TEST_F(CreditCardSaveManagerTest, TEST_F(CreditCardSaveManagerTest,
GetDetectedValues_DetectAddressComponentsAcrossProfiles) { GetDetectedValues_DetectAddressComponentsAcrossProfiles) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set up four new address profiles, each with a different address component. // Set up four new address profiles, each with a different address component.
AutofillProfile profile1; AutofillProfile profile1;
profile1.set_guid("00000000-0000-0000-0000-000000000200"); profile1.set_guid("00000000-0000-0000-0000-000000000200");
...@@ -2951,9 +2775,6 @@ TEST_F(CreditCardSaveManagerTest, ...@@ -2951,9 +2775,6 @@ TEST_F(CreditCardSaveManagerTest,
TEST_F(CreditCardSaveManagerTest, TEST_F(CreditCardSaveManagerTest,
UploadCreditCard_LogAdditionalErrorsWithUploadDetailsFailure) { UploadCreditCard_LogAdditionalErrorsWithUploadDetailsFailure) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Anything other than "en-US" will cause GetUploadDetails to return a failure // Anything other than "en-US" will cause GetUploadDetails to return a failure
// response. // response.
credit_card_save_manager_->SetAppLocale("pt-BR"); credit_card_save_manager_->SetAppLocale("pt-BR");
...@@ -3005,9 +2826,6 @@ TEST_F(CreditCardSaveManagerTest, ...@@ -3005,9 +2826,6 @@ TEST_F(CreditCardSaveManagerTest,
TEST_F( TEST_F(
CreditCardSaveManagerTest, CreditCardSaveManagerTest,
UploadCreditCard_ShouldOfferLocalSaveIfEverythingDetectedAndPaymentsDeclines) { UploadCreditCard_ShouldOfferLocalSaveIfEverythingDetectedAndPaymentsDeclines) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Anything other than "en-US" will cause GetUploadDetails to return a failure // Anything other than "en-US" will cause GetUploadDetails to return a failure
// response. // response.
credit_card_save_manager_->SetAppLocale("pt-BR"); credit_card_save_manager_->SetAppLocale("pt-BR");
...@@ -3048,9 +2866,6 @@ TEST_F( ...@@ -3048,9 +2866,6 @@ TEST_F(
TEST_F( TEST_F(
CreditCardSaveManagerTest, CreditCardSaveManagerTest,
UploadCreditCard_ShouldOfferLocalSaveIfEverythingDetectedAndPaymentsDeclines_WithFirstAndLastName) { UploadCreditCard_ShouldOfferLocalSaveIfEverythingDetectedAndPaymentsDeclines_WithFirstAndLastName) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Anything other than "en-US" will cause GetUploadDetails to return a failure // Anything other than "en-US" will cause GetUploadDetails to return a failure
// response. // response.
credit_card_save_manager_->SetAppLocale("pt-BR"); credit_card_save_manager_->SetAppLocale("pt-BR");
...@@ -3101,9 +2916,6 @@ TEST_F( ...@@ -3101,9 +2916,6 @@ TEST_F(
TEST_F( TEST_F(
CreditCardSaveManagerTest, CreditCardSaveManagerTest,
UploadCreditCard_ShouldNotOfferLocalSaveIfSomethingNotDetectedAndPaymentsDeclines) { UploadCreditCard_ShouldNotOfferLocalSaveIfSomethingNotDetectedAndPaymentsDeclines) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Anything other than "en-US" will cause GetUploadDetails to return a failure // Anything other than "en-US" will cause GetUploadDetails to return a failure
// response. // response.
credit_card_save_manager_->SetAppLocale("pt-BR"); credit_card_save_manager_->SetAppLocale("pt-BR");
...@@ -3140,9 +2952,6 @@ TEST_F( ...@@ -3140,9 +2952,6 @@ TEST_F(
TEST_F(CreditCardSaveManagerTest, TEST_F(CreditCardSaveManagerTest,
UploadCreditCard_PaymentsDecidesOfferToSaveIfNoCvc) { UploadCreditCard_PaymentsDecidesOfferToSaveIfNoCvc) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Create, fill and submit an address form in order to establish a recent // Create, fill and submit an address form in order to establish a recent
// profile which can be selected for the upload request. // profile which can be selected for the upload request.
FormData address_form; FormData address_form;
...@@ -3185,9 +2994,6 @@ TEST_F(CreditCardSaveManagerTest, ...@@ -3185,9 +2994,6 @@ TEST_F(CreditCardSaveManagerTest,
TEST_F(CreditCardSaveManagerTest, TEST_F(CreditCardSaveManagerTest,
UploadCreditCard_PaymentsDecidesOfferToSaveIfNoName) { UploadCreditCard_PaymentsDecidesOfferToSaveIfNoName) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Create, fill and submit an address form in order to establish a recent // Create, fill and submit an address form in order to establish a recent
// profile which can be selected for the upload request. // profile which can be selected for the upload request.
FormData address_form; FormData address_form;
...@@ -3231,9 +3037,6 @@ TEST_F(CreditCardSaveManagerTest, ...@@ -3231,9 +3037,6 @@ TEST_F(CreditCardSaveManagerTest,
TEST_F(CreditCardSaveManagerTest, TEST_F(CreditCardSaveManagerTest,
UploadCreditCard_PaymentsDecidesOfferToSaveIfConflictingNames) { UploadCreditCard_PaymentsDecidesOfferToSaveIfConflictingNames) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Create, fill and submit an address form in order to establish a recent // Create, fill and submit an address form in order to establish a recent
// profile which can be selected for the upload request. // profile which can be selected for the upload request.
FormData address_form; FormData address_form;
...@@ -3276,9 +3079,6 @@ TEST_F(CreditCardSaveManagerTest, ...@@ -3276,9 +3079,6 @@ TEST_F(CreditCardSaveManagerTest,
TEST_F(CreditCardSaveManagerTest, TEST_F(CreditCardSaveManagerTest,
UploadCreditCard_PaymentsDecidesOfferToSaveIfNoZip) { UploadCreditCard_PaymentsDecidesOfferToSaveIfNoZip) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set up a new address profile without a postal code. // Set up a new address profile without a postal code.
AutofillProfile profile; AutofillProfile profile;
profile.set_guid("00000000-0000-0000-0000-000000000200"); profile.set_guid("00000000-0000-0000-0000-000000000200");
...@@ -3323,9 +3123,6 @@ TEST_F(CreditCardSaveManagerTest, ...@@ -3323,9 +3123,6 @@ TEST_F(CreditCardSaveManagerTest,
TEST_F(CreditCardSaveManagerTest, TEST_F(CreditCardSaveManagerTest,
UploadCreditCard_PaymentsDecidesOfferToSaveIfConflictingZips) { UploadCreditCard_PaymentsDecidesOfferToSaveIfConflictingZips) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set up two new address profiles with conflicting postal codes. // Set up two new address profiles with conflicting postal codes.
AutofillProfile profile1; AutofillProfile profile1;
profile1.set_guid("00000000-0000-0000-0000-000000000200"); profile1.set_guid("00000000-0000-0000-0000-000000000200");
...@@ -3382,9 +3179,6 @@ TEST_F(CreditCardSaveManagerTest, ...@@ -3382,9 +3179,6 @@ TEST_F(CreditCardSaveManagerTest,
TEST_F(CreditCardSaveManagerTest, TEST_F(CreditCardSaveManagerTest,
UploadCreditCard_PaymentsDecidesOfferToSaveIfNothingFound) { UploadCreditCard_PaymentsDecidesOfferToSaveIfNothingFound) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set up a new address profile without a name or postal code. // Set up a new address profile without a name or postal code.
AutofillProfile profile; AutofillProfile profile;
profile.set_guid("00000000-0000-0000-0000-000000000200"); profile.set_guid("00000000-0000-0000-0000-000000000200");
...@@ -3436,9 +3230,6 @@ TEST_F( ...@@ -3436,9 +3230,6 @@ TEST_F(
CreditCardSaveManagerTest, CreditCardSaveManagerTest,
UploadCreditCard_AddUpdatePromptExplanationFlagStateToRequestIfExperimentOn) { UploadCreditCard_AddUpdatePromptExplanationFlagStateToRequestIfExperimentOn) {
EnableAutofillUpstreamUpdatePromptExplanationExperiment(); EnableAutofillUpstreamUpdatePromptExplanationExperiment();
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Create, fill and submit an address form in order to establish a recent // Create, fill and submit an address form in order to establish a recent
// profile which can be selected for the upload request. // profile which can be selected for the upload request.
FormData address_form; FormData address_form;
...@@ -3472,8 +3263,6 @@ TEST_F( ...@@ -3472,8 +3263,6 @@ TEST_F(
TEST_F(CreditCardSaveManagerTest, TEST_F(CreditCardSaveManagerTest,
UploadCreditCard_DoNotAddAnyFlagStatesToRequestIfExperimentsOff) { UploadCreditCard_DoNotAddAnyFlagStatesToRequestIfExperimentsOff) {
DisableAutofillUpstreamUpdatePromptExplanationExperiment(); DisableAutofillUpstreamUpdatePromptExplanationExperiment();
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Create, fill and submit an address form in order to establish a recent // Create, fill and submit an address form in order to establish a recent
// profile which can be selected for the upload request. // profile which can be selected for the upload request.
...@@ -3505,8 +3294,6 @@ TEST_F(CreditCardSaveManagerTest, ...@@ -3505,8 +3294,6 @@ TEST_F(CreditCardSaveManagerTest,
TEST_F(CreditCardSaveManagerTest, UploadCreditCard_AddPanFirstSixToRequest) { TEST_F(CreditCardSaveManagerTest, UploadCreditCard_AddPanFirstSixToRequest) {
EnableAutofillUpstreamSendPanFirstSixExperiment(); EnableAutofillUpstreamSendPanFirstSixExperiment();
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Create, fill and submit an address form in order to establish a recent // Create, fill and submit an address form in order to establish a recent
// profile which can be selected for the upload request. // profile which can be selected for the upload request.
...@@ -3543,10 +3330,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_AddPanFirstSixToRequest) { ...@@ -3543,10 +3330,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_AddPanFirstSixToRequest) {
} }
TEST_F(CreditCardSaveManagerTest, UploadCreditCard_UploadOfLocalCard) { TEST_F(CreditCardSaveManagerTest, UploadCreditCard_UploadOfLocalCard) {
personal_data_.ClearCreditCards();
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Add a local credit card whose |TypeAndLastFourDigits| matches what we will // Add a local credit card whose |TypeAndLastFourDigits| matches what we will
// enter below. // enter below.
CreditCard local_card; CreditCard local_card;
...@@ -3595,11 +3378,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_UploadOfLocalCard) { ...@@ -3595,11 +3378,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_UploadOfLocalCard) {
} }
TEST_F(CreditCardSaveManagerTest, UploadCreditCard_UploadOfNewCard) { TEST_F(CreditCardSaveManagerTest, UploadCreditCard_UploadOfNewCard) {
// No cards already on the device.
personal_data_.ClearCreditCards();
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Create, fill and submit an address form in order to establish a recent // Create, fill and submit an address form in order to establish a recent
// profile which can be selected for the upload request. // profile which can be selected for the upload request.
FormData address_form; FormData address_form;
...@@ -3640,8 +3418,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_UploadOfNewCard) { ...@@ -3640,8 +3418,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_UploadOfNewCard) {
} }
TEST_F(CreditCardSaveManagerTest, UploadCreditCard_EloDisallowed) { TEST_F(CreditCardSaveManagerTest, UploadCreditCard_EloDisallowed) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
scoped_feature_list_.InitAndEnableFeature( scoped_feature_list_.InitAndEnableFeature(
features::kAutofillUpstreamDisallowElo); features::kAutofillUpstreamDisallowElo);
...@@ -3672,8 +3448,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_EloDisallowed) { ...@@ -3672,8 +3448,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_EloDisallowed) {
} }
TEST_F(CreditCardSaveManagerTest, UploadCreditCard_EloAllowed) { TEST_F(CreditCardSaveManagerTest, UploadCreditCard_EloAllowed) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
scoped_feature_list_.InitAndDisableFeature( scoped_feature_list_.InitAndDisableFeature(
features::kAutofillUpstreamDisallowElo); features::kAutofillUpstreamDisallowElo);
...@@ -3703,8 +3477,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_EloAllowed) { ...@@ -3703,8 +3477,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_EloAllowed) {
} }
TEST_F(CreditCardSaveManagerTest, UploadCreditCard_JcbDisallowed) { TEST_F(CreditCardSaveManagerTest, UploadCreditCard_JcbDisallowed) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
scoped_feature_list_.InitAndEnableFeature( scoped_feature_list_.InitAndEnableFeature(
features::kAutofillUpstreamDisallowJcb); features::kAutofillUpstreamDisallowJcb);
...@@ -3735,8 +3507,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_JcbDisallowed) { ...@@ -3735,8 +3507,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_JcbDisallowed) {
} }
TEST_F(CreditCardSaveManagerTest, UploadCreditCard_JcbAllowed) { TEST_F(CreditCardSaveManagerTest, UploadCreditCard_JcbAllowed) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
scoped_feature_list_.InitAndDisableFeature( scoped_feature_list_.InitAndDisableFeature(
features::kAutofillUpstreamDisallowJcb); features::kAutofillUpstreamDisallowJcb);
...@@ -3770,8 +3540,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_JcbAllowed) { ...@@ -3770,8 +3540,6 @@ TEST_F(CreditCardSaveManagerTest, UploadCreditCard_JcbAllowed) {
// This test ensures that we do not offer local save (again) for the card that // This test ensures that we do not offer local save (again) for the card that
// FormDataImporter imported. // FormDataImporter imported.
TEST_F(CreditCardSaveManagerTest, UploadCreditCard_DisallowedLocalCard) { TEST_F(CreditCardSaveManagerTest, UploadCreditCard_DisallowedLocalCard) {
personal_data_.ClearProfiles();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
scoped_feature_list_.InitAndEnableFeature( scoped_feature_list_.InitAndEnableFeature(
features::kAutofillUpstreamDisallowElo); features::kAutofillUpstreamDisallowElo);
......
components/autofill/core/browser/local_card_migration_manager_unittest.cc
View file @ 6e4f7dc4
...@@ -73,6 +73,7 @@ class LocalCardMigrationManagerTest : public testing::Test { ...@@ -73,6 +73,7 @@ class LocalCardMigrationManagerTest : public testing::Test {
credit_card_save_manager_ = credit_card_save_manager_ =
new TestCreditCardSaveManager(autofill_driver_.get(), &autofill_client_, new TestCreditCardSaveManager(autofill_driver_.get(), &autofill_client_,
payments_client_, &personal_data_); payments_client_, &personal_data_);
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
local_card_migration_manager_ = new TestLocalCardMigrationManager( local_card_migration_manager_ = new TestLocalCardMigrationManager(
autofill_driver_.get(), &autofill_client_, payments_client_, autofill_driver_.get(), &autofill_client_, payments_client_,
&personal_data_); &personal_data_);
...@@ -174,7 +175,7 @@ class LocalCardMigrationManagerTest : public testing::Test { ...@@ -174,7 +175,7 @@ class LocalCardMigrationManagerTest : public testing::Test {
TEST_F(LocalCardMigrationManagerTest, TEST_F(LocalCardMigrationManagerTest,
MigrateCreditCard_UseLocalCardWithOneLocal) { MigrateCreditCard_UseLocalCardWithOneLocal) {
EnableAutofillCreditCardLocalCardMigrationExperiment(); EnableAutofillCreditCardLocalCardMigrationExperiment();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set the billing_customer_number Priority Preference to designate // Set the billing_customer_number Priority Preference to designate
// existence of a Payments account. // existence of a Payments account.
autofill_client_.GetPrefs()->SetDouble(prefs::kAutofillBillingCustomerNumber, autofill_client_.GetPrefs()->SetDouble(prefs::kAutofillBillingCustomerNumber,
...@@ -201,7 +202,7 @@ TEST_F(LocalCardMigrationManagerTest, ...@@ -201,7 +202,7 @@ TEST_F(LocalCardMigrationManagerTest,
TEST_F(LocalCardMigrationManagerTest, TEST_F(LocalCardMigrationManagerTest,
MigrateCreditCard_UseNewCardWithAnyLocal) { MigrateCreditCard_UseNewCardWithAnyLocal) {
EnableAutofillCreditCardLocalCardMigrationExperiment(); EnableAutofillCreditCardLocalCardMigrationExperiment();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set the billing_customer_number Priority Preference to designate // Set the billing_customer_number Priority Preference to designate
// existence of a Payments account. // existence of a Payments account.
autofill_client_.GetPrefs()->SetDouble(prefs::kAutofillBillingCustomerNumber, autofill_client_.GetPrefs()->SetDouble(prefs::kAutofillBillingCustomerNumber,
...@@ -231,7 +232,7 @@ TEST_F(LocalCardMigrationManagerTest, ...@@ -231,7 +232,7 @@ TEST_F(LocalCardMigrationManagerTest,
TEST_F(LocalCardMigrationManagerTest, TEST_F(LocalCardMigrationManagerTest,
MigrateCreditCard_UseLocalCardWithMoreLocal) { MigrateCreditCard_UseLocalCardWithMoreLocal) {
EnableAutofillCreditCardLocalCardMigrationExperiment(); EnableAutofillCreditCardLocalCardMigrationExperiment();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set the billing_customer_number Priority Preference to designate // Set the billing_customer_number Priority Preference to designate
// existence of a Payments account. // existence of a Payments account.
autofill_client_.GetPrefs()->SetDouble(prefs::kAutofillBillingCustomerNumber, autofill_client_.GetPrefs()->SetDouble(prefs::kAutofillBillingCustomerNumber,
...@@ -261,7 +262,7 @@ TEST_F(LocalCardMigrationManagerTest, ...@@ -261,7 +262,7 @@ TEST_F(LocalCardMigrationManagerTest,
TEST_F(LocalCardMigrationManagerTest, TEST_F(LocalCardMigrationManagerTest,
MigrateCreditCard_UseLocalCardWithInvalidLocal) { MigrateCreditCard_UseLocalCardWithInvalidLocal) {
EnableAutofillCreditCardLocalCardMigrationExperiment(); EnableAutofillCreditCardLocalCardMigrationExperiment();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set the billing_customer_number Priority Preference to designate // Set the billing_customer_number Priority Preference to designate
// existence of a Payments account. // existence of a Payments account.
autofill_client_.GetPrefs()->SetDouble(prefs::kAutofillBillingCustomerNumber, autofill_client_.GetPrefs()->SetDouble(prefs::kAutofillBillingCustomerNumber,
...@@ -294,7 +295,7 @@ TEST_F(LocalCardMigrationManagerTest, ...@@ -294,7 +295,7 @@ TEST_F(LocalCardMigrationManagerTest,
TEST_F(LocalCardMigrationManagerTest, TEST_F(LocalCardMigrationManagerTest,
MigrateCreditCard_UseServerCardWithOneValidLocal) { MigrateCreditCard_UseServerCardWithOneValidLocal) {
EnableAutofillCreditCardLocalCardMigrationExperiment(); EnableAutofillCreditCardLocalCardMigrationExperiment();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set the billing_customer_number Priority Preference to designate // Set the billing_customer_number Priority Preference to designate
// existence of a Payments account. // existence of a Payments account.
autofill_client_.GetPrefs()->SetDouble(prefs::kAutofillBillingCustomerNumber, autofill_client_.GetPrefs()->SetDouble(prefs::kAutofillBillingCustomerNumber,
...@@ -327,7 +328,7 @@ TEST_F(LocalCardMigrationManagerTest, ...@@ -327,7 +328,7 @@ TEST_F(LocalCardMigrationManagerTest,
TEST_F(LocalCardMigrationManagerTest, TEST_F(LocalCardMigrationManagerTest,
MigrateCreditCard_UseServerCardWithNoneValidLocal) { MigrateCreditCard_UseServerCardWithNoneValidLocal) {
EnableAutofillCreditCardLocalCardMigrationExperiment(); EnableAutofillCreditCardLocalCardMigrationExperiment();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set the billing_customer_number Priority Preference to designate // Set the billing_customer_number Priority Preference to designate
// existence of a Payments account. // existence of a Payments account.
autofill_client_.GetPrefs()->SetDouble(prefs::kAutofillBillingCustomerNumber, autofill_client_.GetPrefs()->SetDouble(prefs::kAutofillBillingCustomerNumber,
...@@ -363,7 +364,7 @@ TEST_F(LocalCardMigrationManagerTest, ...@@ -363,7 +364,7 @@ TEST_F(LocalCardMigrationManagerTest,
TEST_F(LocalCardMigrationManagerTest, MigrateCreditCard_FeatureNotEnabled) { TEST_F(LocalCardMigrationManagerTest, MigrateCreditCard_FeatureNotEnabled) {
// Turn off the experiment flag. // Turn off the experiment flag.
DisableAutofillCreditCardLocalCardMigrationExperiment(); DisableAutofillCreditCardLocalCardMigrationExperiment();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set the billing_customer_number Priority Preference to designate // Set the billing_customer_number Priority Preference to designate
// existence of a Payments account. // existence of a Payments account.
autofill_client_.GetPrefs()->SetDouble(prefs::kAutofillBillingCustomerNumber, autofill_client_.GetPrefs()->SetDouble(prefs::kAutofillBillingCustomerNumber,
...@@ -392,7 +393,7 @@ TEST_F(LocalCardMigrationManagerTest, MigrateCreditCard_FeatureNotEnabled) { ...@@ -392,7 +393,7 @@ TEST_F(LocalCardMigrationManagerTest, MigrateCreditCard_FeatureNotEnabled) {
// number is blank, will not trigger migration. // number is blank, will not trigger migration.
TEST_F(LocalCardMigrationManagerTest, MigrateCreditCard_NoPaymentsAccount) { TEST_F(LocalCardMigrationManagerTest, MigrateCreditCard_NoPaymentsAccount) {
EnableAutofillCreditCardLocalCardMigrationExperiment(); EnableAutofillCreditCardLocalCardMigrationExperiment();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Add a local credit card whose |TypeAndLastFourDigits| matches what we will // Add a local credit card whose |TypeAndLastFourDigits| matches what we will
// enter below. // enter below.
AddLocalCrediCard(personal_data_, "Flo Master", "4111111111111111", "11", AddLocalCrediCard(personal_data_, "Flo Master", "4111111111111111", "11",
...@@ -418,7 +419,7 @@ TEST_F(LocalCardMigrationManagerTest, MigrateCreditCard_NoPaymentsAccount) { ...@@ -418,7 +419,7 @@ TEST_F(LocalCardMigrationManagerTest, MigrateCreditCard_NoPaymentsAccount) {
TEST_F(LocalCardMigrationManagerTest, TEST_F(LocalCardMigrationManagerTest,
MigrateCreditCard_LocalCardMatchMaskedServerCard) { MigrateCreditCard_LocalCardMatchMaskedServerCard) {
EnableAutofillCreditCardLocalCardMigrationExperiment(); EnableAutofillCreditCardLocalCardMigrationExperiment();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set the billing_customer_number Priority Preference to designate // Set the billing_customer_number Priority Preference to designate
// existence of a Payments account. // existence of a Payments account.
autofill_client_.GetPrefs()->SetDouble(prefs::kAutofillBillingCustomerNumber, autofill_client_.GetPrefs()->SetDouble(prefs::kAutofillBillingCustomerNumber,
...@@ -455,7 +456,7 @@ TEST_F(LocalCardMigrationManagerTest, ...@@ -455,7 +456,7 @@ TEST_F(LocalCardMigrationManagerTest,
TEST_F(LocalCardMigrationManagerTest, TEST_F(LocalCardMigrationManagerTest,
MigrateCreditCard_LocalCardMatchFullServerCard) { MigrateCreditCard_LocalCardMatchFullServerCard) {
EnableAutofillCreditCardLocalCardMigrationExperiment(); EnableAutofillCreditCardLocalCardMigrationExperiment();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set the billing_customer_number Priority Preference to designate // Set the billing_customer_number Priority Preference to designate
// existence of a Payments account. // existence of a Payments account.
autofill_client_.GetPrefs()->SetDouble(prefs::kAutofillBillingCustomerNumber, autofill_client_.GetPrefs()->SetDouble(prefs::kAutofillBillingCustomerNumber,
...@@ -487,7 +488,7 @@ TEST_F(LocalCardMigrationManagerTest, ...@@ -487,7 +488,7 @@ TEST_F(LocalCardMigrationManagerTest,
// GetDetectedValues() should includes cardholder name if all cards have it. // GetDetectedValues() should includes cardholder name if all cards have it.
TEST_F(LocalCardMigrationManagerTest, GetDetectedValues_AllWithCardHolderName) { TEST_F(LocalCardMigrationManagerTest, GetDetectedValues_AllWithCardHolderName) {
EnableAutofillCreditCardLocalCardMigrationExperiment(); EnableAutofillCreditCardLocalCardMigrationExperiment();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set the billing_customer_number Priority Preference to designate // Set the billing_customer_number Priority Preference to designate
// existence of a Payments account. // existence of a Payments account.
autofill_client_.GetPrefs()->SetDouble(prefs::kAutofillBillingCustomerNumber, autofill_client_.GetPrefs()->SetDouble(prefs::kAutofillBillingCustomerNumber,
...@@ -519,7 +520,7 @@ TEST_F(LocalCardMigrationManagerTest, GetDetectedValues_AllWithCardHolderName) { ...@@ -519,7 +520,7 @@ TEST_F(LocalCardMigrationManagerTest, GetDetectedValues_AllWithCardHolderName) {
TEST_F(LocalCardMigrationManagerTest, TEST_F(LocalCardMigrationManagerTest,
GetDetectedValues_OneCardWithoutCardHolderName) { GetDetectedValues_OneCardWithoutCardHolderName) {
EnableAutofillCreditCardLocalCardMigrationExperiment(); EnableAutofillCreditCardLocalCardMigrationExperiment();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set the billing_customer_number Priority Preference to designate // Set the billing_customer_number Priority Preference to designate
// existence of a Payments account. // existence of a Payments account.
autofill_client_.GetPrefs()->SetDouble(prefs::kAutofillBillingCustomerNumber, autofill_client_.GetPrefs()->SetDouble(prefs::kAutofillBillingCustomerNumber,
...@@ -550,7 +551,7 @@ TEST_F(LocalCardMigrationManagerTest, ...@@ -550,7 +551,7 @@ TEST_F(LocalCardMigrationManagerTest,
TEST_F(LocalCardMigrationManagerTest, TEST_F(LocalCardMigrationManagerTest,
GetDetectedValues_IncludeGooglePaymentsAccount) { GetDetectedValues_IncludeGooglePaymentsAccount) {
EnableAutofillCreditCardLocalCardMigrationExperiment(); EnableAutofillCreditCardLocalCardMigrationExperiment();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set the billing_customer_number Priority Preference to designate // Set the billing_customer_number Priority Preference to designate
// existence of a Payments account. // existence of a Payments account.
autofill_client_.GetPrefs()->SetDouble(prefs::kAutofillBillingCustomerNumber, autofill_client_.GetPrefs()->SetDouble(prefs::kAutofillBillingCustomerNumber,
...@@ -583,7 +584,7 @@ TEST_F(LocalCardMigrationManagerTest, ...@@ -583,7 +584,7 @@ TEST_F(LocalCardMigrationManagerTest,
TEST_F(LocalCardMigrationManagerTest, TEST_F(LocalCardMigrationManagerTest,
MigrateCreditCard_TriggerFromSettingsPage) { MigrateCreditCard_TriggerFromSettingsPage) {
EnableAutofillCreditCardLocalCardMigrationExperiment(); EnableAutofillCreditCardLocalCardMigrationExperiment();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set the billing_customer_number Priority Preference to designate // Set the billing_customer_number Priority Preference to designate
// existence of a Payments account. // existence of a Payments account.
autofill_client_.GetPrefs()->SetDouble(prefs::kAutofillBillingCustomerNumber, autofill_client_.GetPrefs()->SetDouble(prefs::kAutofillBillingCustomerNumber,
...@@ -606,7 +607,7 @@ TEST_F(LocalCardMigrationManagerTest, ...@@ -606,7 +607,7 @@ TEST_F(LocalCardMigrationManagerTest,
TEST_F(LocalCardMigrationManagerTest, TEST_F(LocalCardMigrationManagerTest,
MigrateCreditCard_TriggerFromSubmittedForm) { MigrateCreditCard_TriggerFromSubmittedForm) {
EnableAutofillCreditCardLocalCardMigrationExperiment(); EnableAutofillCreditCardLocalCardMigrationExperiment();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set the billing_customer_number Priority Preference to designate // Set the billing_customer_number Priority Preference to designate
// existence of a Payments account. // existence of a Payments account.
autofill_client_.GetPrefs()->SetDouble(prefs::kAutofillBillingCustomerNumber, autofill_client_.GetPrefs()->SetDouble(prefs::kAutofillBillingCustomerNumber,
...@@ -636,7 +637,7 @@ TEST_F(LocalCardMigrationManagerTest, ...@@ -636,7 +637,7 @@ TEST_F(LocalCardMigrationManagerTest,
// status is correctly set. // status is correctly set.
TEST_F(LocalCardMigrationManagerTest, MigrateCreditCard_MigrationSuccess) { TEST_F(LocalCardMigrationManagerTest, MigrateCreditCard_MigrationSuccess) {
EnableAutofillCreditCardLocalCardMigrationExperiment(); EnableAutofillCreditCardLocalCardMigrationExperiment();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set the billing_customer_number Priority Preference to designate // Set the billing_customer_number Priority Preference to designate
// existence of a Payments account. // existence of a Payments account.
autofill_client_.GetPrefs()->SetDouble(prefs::kAutofillBillingCustomerNumber, autofill_client_.GetPrefs()->SetDouble(prefs::kAutofillBillingCustomerNumber,
...@@ -671,7 +672,7 @@ TEST_F(LocalCardMigrationManagerTest, MigrateCreditCard_MigrationSuccess) { ...@@ -671,7 +672,7 @@ TEST_F(LocalCardMigrationManagerTest, MigrateCreditCard_MigrationSuccess) {
TEST_F(LocalCardMigrationManagerTest, TEST_F(LocalCardMigrationManagerTest,
MigrateCreditCard_MigrationTemporaryFailure) { MigrateCreditCard_MigrationTemporaryFailure) {
EnableAutofillCreditCardLocalCardMigrationExperiment(); EnableAutofillCreditCardLocalCardMigrationExperiment();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set the billing_customer_number Priority Preference to designate // Set the billing_customer_number Priority Preference to designate
// existence of a Payments account. // existence of a Payments account.
autofill_client_.GetPrefs()->SetDouble(prefs::kAutofillBillingCustomerNumber, autofill_client_.GetPrefs()->SetDouble(prefs::kAutofillBillingCustomerNumber,
...@@ -708,7 +709,7 @@ TEST_F(LocalCardMigrationManagerTest, ...@@ -708,7 +709,7 @@ TEST_F(LocalCardMigrationManagerTest,
TEST_F(LocalCardMigrationManagerTest, TEST_F(LocalCardMigrationManagerTest,
MigrateCreditCard_MigrationPermanentFailure) { MigrateCreditCard_MigrationPermanentFailure) {
EnableAutofillCreditCardLocalCardMigrationExperiment(); EnableAutofillCreditCardLocalCardMigrationExperiment();
credit_card_save_manager_->SetCreditCardUploadEnabled(true);
// Set the billing_customer_number Priority Preference to designate // Set the billing_customer_number Priority Preference to designate
// existence of a Payments account. // existence of a Payments account.
autofill_client_.GetPrefs()->SetDouble(prefs::kAutofillBillingCustomerNumber, autofill_client_.GetPrefs()->SetDouble(prefs::kAutofillBillingCustomerNumber,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment