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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 23033016: Remove autocheckout code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixing compile failures and tests. Created 7 years, 4 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
« components/autofill/core/browser/autofill_xml_parser.cc ('K') | « components/autofill/core/browser/autofill_xml_parser.cc ('k') | components/autofill/core/browser/form_structure.h » ('j') | components/autofill/core/browser/form_structure.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/autofill/core/browser/autofill_xml_parser_unittest.cc
diff --git a/components/autofill/core/browser/autofill_xml_parser_unittest.cc b/components/autofill/core/browser/autofill_xml_parser_unittest.cc
index 0c6b0f2154ba138e217298370c66856fb5823f09..be21d3dac9781ecaf8bdb3f65b7e0862ee8a0aa8 100644
--- a/components/autofill/core/browser/autofill_xml_parser_unittest.cc
+++ b/components/autofill/core/browser/autofill_xml_parser_unittest.cc
@@ -7,7 +7,6 @@
#include "base/memory/scoped_ptr.h"
#include "base/strings/string_number_conversions.h"
-#include "components/autofill/content/browser/autocheckout_page_meta_data.h"
#include "components/autofill/core/browser/autofill_xml_parser.h"
#include "components/autofill/core/browser/field_types.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -26,8 +25,7 @@ class AutofillQueryXmlParserTest : public testing::Test {
// Create a parser.
AutofillQueryXmlParser parse_handler(&field_infos_,
&upload_required_,
- &experiment_id_,
- &page_meta_data_);
+ &experiment_id_);
buzz::XmlParser parser(&parse_handler);
parser.Parse(xml.c_str(), xml.length(), true);
EXPECT_EQ(should_succeed, parse_handler.succeeded());
@@ -36,7 +34,6 @@ class AutofillQueryXmlParserTest : public testing::Test {
std::vector<AutofillServerFieldInfo> field_infos_;
UploadRequired upload_required_;
std::string experiment_id_;
- autofill::AutocheckoutPageMetaData page_meta_data_;
};
class AutofillUploadXmlParserTest : public testing::Test {
@@ -172,180 +169,6 @@ TEST_F(AutofillQueryXmlParserTest, ParseExperimentId) {
#define MAYBE_ParseAutofillFlow ParseAutofillFlow
#endif
-// Test XML response with autofill_flow information.
-TEST_F(AutofillQueryXmlParserTest, MAYBE_ParseAutofillFlow) {
- std::string xml = "<autofillqueryresponse>"
- "<field autofilltype=\"55\"/>"
- "<autofill_flow page_no=\"1\" total_pages=\"10\">"
- "<page_advance_button id=\"foo\"/>"
- "<flow_page page_no=\"0\">"
- "<type>1</type>"
- "<type>2</type>"
- "</flow_page>"
- "<flow_page page_no=\"1\">"
- "<type>3</type>"
- "</flow_page>"
- "</autofill_flow>"
- "</autofillqueryresponse>";
-
- ParseQueryXML(xml, true);
-
- EXPECT_EQ(1U, field_infos_.size());
- EXPECT_EQ(1, page_meta_data_.current_page_number);
- EXPECT_EQ(10, page_meta_data_.total_pages);
- EXPECT_TRUE(page_meta_data_.ignore_ajax);
- EXPECT_EQ("foo", page_meta_data_.proceed_element_descriptor.descriptor);
- EXPECT_EQ(autofill::WebElementDescriptor::ID,
- page_meta_data_.proceed_element_descriptor.retrieval_method);
- EXPECT_EQ(2U, page_meta_data_.page_types.size());
- EXPECT_EQ(2U, page_meta_data_.page_types[0].size());
- EXPECT_EQ(1U, page_meta_data_.page_types[1].size());
- EXPECT_EQ(AUTOCHECKOUT_STEP_SHIPPING, page_meta_data_.page_types[0][0]);
- EXPECT_EQ(AUTOCHECKOUT_STEP_DELIVERY, page_meta_data_.page_types[0][1]);
- EXPECT_EQ(AUTOCHECKOUT_STEP_BILLING, page_meta_data_.page_types[1][0]);
-
- // Clear |field_infos_| for the next test;
- field_infos_.clear();
-
- // Test css_selector as page_advance_button.
- xml = "<autofillqueryresponse>"
- "<field autofilltype=\"55\"/>"
- "<autofill_flow page_no=\"1\" total_pages=\"10\">"
- "<page_advance_button css_selector=\"[name=&quot;foo&quot;]\"/>"
- "</autofill_flow>"
- "</autofillqueryresponse>";
-
- ParseQueryXML(xml, true);
-
- EXPECT_EQ(1U, field_infos_.size());
- EXPECT_EQ(1, page_meta_data_.current_page_number);
- EXPECT_EQ(10, page_meta_data_.total_pages);
- EXPECT_EQ("[name=\"foo\"]",
- page_meta_data_.proceed_element_descriptor.descriptor);
- EXPECT_EQ(autofill::WebElementDescriptor::CSS_SELECTOR,
- page_meta_data_.proceed_element_descriptor.retrieval_method);
-
- // Clear |field_infos_| for the next test;
- field_infos_.clear();
-
- // Test first attribute is always the one set.
- xml = "<autofillqueryresponse>"
- "<field autofilltype=\"55\"/>"
- "<autofill_flow page_no=\"1\" total_pages=\"10\">"
- "<page_advance_button css_selector=\"[name=&quot;foo&quot;]\""
- " id=\"foo\"/>"
- "</autofill_flow>"
- "</autofillqueryresponse>";
-
- ParseQueryXML(xml, true);
-
- EXPECT_EQ(1U, field_infos_.size());
- EXPECT_EQ(1, page_meta_data_.current_page_number);
- EXPECT_EQ(10, page_meta_data_.total_pages);
- EXPECT_EQ("[name=\"foo\"]",
- page_meta_data_.proceed_element_descriptor.descriptor);
- EXPECT_EQ(autofill::WebElementDescriptor::CSS_SELECTOR,
- page_meta_data_.proceed_element_descriptor.retrieval_method);
-
- // Clear |field_infos_| for the next test;
- field_infos_.clear();
-
- // Test parsing click_elements_before_formfill correctly.
- xml = "<autofillqueryresponse>"
- "<field autofilltype=\"55\"/>"
- "<autofill_flow page_no=\"1\" total_pages=\"10\">"
- "<click_elements_before_formfill>"
- "<web_element id=\"btn1\" /></click_elements_before_formfill>"
- "<click_elements_before_formfill>"
- "<web_element css_selector=\"[name=&quot;btn2&quot;]\"/>"
- "</click_elements_before_formfill>"
- "</autofill_flow>"
- "</autofillqueryresponse>";
-
- ParseQueryXML(xml, true);
-
- EXPECT_EQ(1U, field_infos_.size());
- EXPECT_EQ(1, page_meta_data_.current_page_number);
- EXPECT_EQ(10, page_meta_data_.total_pages);
- ASSERT_EQ(2U, page_meta_data_.click_elements_before_form_fill.size());
- autofill::WebElementDescriptor& click_elment =
- page_meta_data_.click_elements_before_form_fill[0];
- EXPECT_EQ("btn1", click_elment.descriptor);
- EXPECT_EQ(autofill::WebElementDescriptor::ID, click_elment.retrieval_method);
- click_elment = page_meta_data_.click_elements_before_form_fill[1];
- EXPECT_EQ("[name=\"btn2\"]", click_elment.descriptor);
- EXPECT_EQ(autofill::WebElementDescriptor::CSS_SELECTOR,
- click_elment.retrieval_method);
-
- // Clear |field_infos_| for the next test;
- field_infos_.clear();
-
- // Test parsing click_elements_after_formfill correctly.
- xml = "<autofillqueryresponse>"
- "<field autofilltype=\"55\"/>"
- "<autofill_flow page_no=\"1\" total_pages=\"10\">"
- "<click_elements_after_formfill>"
- "<web_element id=\"btn1\" /></click_elements_after_formfill>"
- "</autofill_flow>"
- "</autofillqueryresponse>";
-
- ParseQueryXML(xml, true);
-
- EXPECT_EQ(1U, field_infos_.size());
- EXPECT_EQ(1, page_meta_data_.current_page_number);
- EXPECT_EQ(10, page_meta_data_.total_pages);
- ASSERT_EQ(1U, page_meta_data_.click_elements_after_form_fill.size());
- click_elment = page_meta_data_.click_elements_after_form_fill[0];
- EXPECT_EQ("btn1", click_elment.descriptor);
- EXPECT_EQ(autofill::WebElementDescriptor::ID, click_elment.retrieval_method);
-
- // Clear |field_infos_| for the next test.
- field_infos_.clear();
-
- // Test setting of ignore_ajax attribute.
- xml = "<autofillqueryresponse>"
- "<field autofilltype=\"55\"/>"
- "<autofill_flow page_no=\"1\" total_pages=\"10\" ignore_ajax=\"true\">"
- "<page_advance_button css_selector=\"[name=&quot;foo&quot;]\""
- " id=\"foo\"/>"
- "</autofill_flow>"
- "</autofillqueryresponse>";
-
- ParseQueryXML(xml, true);
-
- EXPECT_EQ(1U, field_infos_.size());
- EXPECT_EQ(1, page_meta_data_.current_page_number);
- EXPECT_EQ(10, page_meta_data_.total_pages);
- EXPECT_TRUE(page_meta_data_.ignore_ajax);
- EXPECT_EQ("[name=\"foo\"]",
- page_meta_data_.proceed_element_descriptor.descriptor);
- EXPECT_EQ(autofill::WebElementDescriptor::CSS_SELECTOR,
- page_meta_data_.proceed_element_descriptor.retrieval_method);
-
- // Clear |field_infos_| for the next test.
- field_infos_.clear();
-
- // Test redundant setting to false of ignore_ajax attribute.
- xml = "<autofillqueryresponse>"
- "<field autofilltype=\"55\"/>"
- "<autofill_flow page_no=\"1\" total_pages=\"10\" ignore_ajax=\"false\">"
- "<page_advance_button css_selector=\"[name=&quot;foo&quot;]\""
- " id=\"foo\"/>"
- "</autofill_flow>"
- "</autofillqueryresponse>";
-
- ParseQueryXML(xml, true);
-
- EXPECT_EQ(1U, field_infos_.size());
- EXPECT_EQ(1, page_meta_data_.current_page_number);
- EXPECT_EQ(10, page_meta_data_.total_pages);
- EXPECT_FALSE(page_meta_data_.ignore_ajax);
- EXPECT_EQ("[name=\"foo\"]",
- page_meta_data_.proceed_element_descriptor.descriptor);
- EXPECT_EQ(autofill::WebElementDescriptor::CSS_SELECTOR,
- page_meta_data_.proceed_element_descriptor.retrieval_method);
-}
-
// Test badly formed XML queries.
TEST_F(AutofillQueryXmlParserTest, ParseErrors) {
// Test no Autofill type.
« components/autofill/core/browser/autofill_xml_parser.cc ('K') | « components/autofill/core/browser/autofill_xml_parser.cc ('k') | components/autofill/core/browser/form_structure.h » ('j') | components/autofill/core/browser/form_structure.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698