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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/libaddressinput/chromium/cpp/test/rule_test.cc

Issue 261013010: autocomplete: add ability to get full address (hidden behind a flag). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: self review Created 6 years, 7 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 | « third_party/libaddressinput/chromium/cpp/test/address_ui_test.cc ('k') | third_party/libaddressinput/libaddressinput.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libaddressinput/chromium/cpp/test/rule_test.cc
diff --git a/third_party/libaddressinput/chromium/cpp/test/rule_test.cc b/third_party/libaddressinput/chromium/cpp/test/rule_test.cc
index c15895578862cfcb0fbc8e7fada0d0fbd25cf42a..306b9651269a742b38554f365e3e2e409c694b12 100644
--- a/third_party/libaddressinput/chromium/cpp/test/rule_test.cc
+++ b/third_party/libaddressinput/chromium/cpp/test/rule_test.cc
@@ -22,7 +22,6 @@
#include <gtest/gtest.h>
-#include "grit/libaddressinput_strings.h"
#include "region_data_constants.h"
namespace {
@@ -72,14 +71,10 @@ TEST(RuleTest, CopyOverwritesRule) {
EXPECT_NE(rule.GetLanguages(), copy.GetLanguages());
EXPECT_NE(rule.GetLanguage(), copy.GetLanguage());
EXPECT_NE(rule.GetPostalCodeFormat(), copy.GetPostalCodeFormat());
- EXPECT_NE(rule.GetAdminAreaNameMessageId(),
- copy.GetAdminAreaNameMessageId());
- EXPECT_NE(rule.GetInvalidAdminAreaMessageId(),
- copy.GetInvalidAdminAreaMessageId());
- EXPECT_NE(rule.GetPostalCodeNameMessageId(),
- copy.GetPostalCodeNameMessageId());
- EXPECT_NE(rule.GetInvalidPostalCodeMessageId(),
- copy.GetInvalidPostalCodeMessageId());
+ EXPECT_NE(rule.GetAdminAreaNameType(),
+ copy.GetAdminAreaNameType());
+ EXPECT_NE(rule.GetPostalCodeNameType(),
+ copy.GetPostalCodeNameType());
copy.CopyFrom(rule);
EXPECT_EQ(rule.GetFormat(), copy.GetFormat());
@@ -88,14 +83,10 @@ TEST(RuleTest, CopyOverwritesRule) {
EXPECT_EQ(rule.GetLanguages(), copy.GetLanguages());
EXPECT_EQ(rule.GetLanguage(), copy.GetLanguage());
EXPECT_EQ(rule.GetPostalCodeFormat(), copy.GetPostalCodeFormat());
- EXPECT_EQ(rule.GetAdminAreaNameMessageId(),
- copy.GetAdminAreaNameMessageId());
- EXPECT_EQ(rule.GetInvalidAdminAreaMessageId(),
- copy.GetInvalidAdminAreaMessageId());
- EXPECT_EQ(rule.GetPostalCodeNameMessageId(),
- copy.GetPostalCodeNameMessageId());
- EXPECT_EQ(rule.GetInvalidPostalCodeMessageId(),
- copy.GetInvalidPostalCodeMessageId());
+ EXPECT_EQ(rule.GetAdminAreaNameType(),
+ copy.GetAdminAreaNameType());
+ EXPECT_EQ(rule.GetPostalCodeNameType(),
+ copy.GetPostalCodeNameType());
}
TEST(RuleTest, ParseOverwritesRule) {
@@ -117,14 +108,8 @@ TEST(RuleTest, ParseOverwritesRule) {
EXPECT_FALSE(rule.GetLanguages().empty());
EXPECT_FALSE(rule.GetLanguage().empty());
EXPECT_FALSE(rule.GetPostalCodeFormat().empty());
- EXPECT_EQ(IDS_LIBADDRESSINPUT_I18N_AREA,
- rule.GetAdminAreaNameMessageId());
- EXPECT_EQ(IDS_LIBADDRESSINPUT_I18N_INVALID_AREA,
- rule.GetInvalidAdminAreaMessageId());
- EXPECT_EQ(IDS_LIBADDRESSINPUT_I18N_POSTAL_CODE_LABEL,
- rule.GetPostalCodeNameMessageId());
- EXPECT_EQ(IDS_LIBADDRESSINPUT_I18N_INVALID_POSTAL_CODE_LABEL,
- rule.GetInvalidPostalCodeMessageId());
+ EXPECT_EQ("area", rule.GetAdminAreaNameType());
+ EXPECT_EQ("postal", rule.GetPostalCodeNameType());
ASSERT_TRUE(rule.ParseSerializedRule(
"{"
@@ -143,14 +128,8 @@ TEST(RuleTest, ParseOverwritesRule) {
EXPECT_TRUE(rule.GetLanguages().empty());
EXPECT_TRUE(rule.GetLanguage().empty());
EXPECT_TRUE(rule.GetPostalCodeFormat().empty());
- EXPECT_EQ(IDS_LIBADDRESSINPUT_I18N_DO_SI,
- rule.GetAdminAreaNameMessageId());
- EXPECT_EQ(IDS_LIBADDRESSINPUT_I18N_INVALID_DO_SI,
- rule.GetInvalidAdminAreaMessageId());
- EXPECT_EQ(IDS_LIBADDRESSINPUT_I18N_ZIP_CODE_LABEL,
- rule.GetPostalCodeNameMessageId());
- EXPECT_EQ(IDS_LIBADDRESSINPUT_I18N_INVALID_ZIP_CODE_LABEL,
- rule.GetInvalidPostalCodeMessageId());
+ EXPECT_EQ("do_si", rule.GetAdminAreaNameType());
+ EXPECT_EQ("zip", rule.GetPostalCodeNameType());
}
TEST(RuleTest, ParseEmptyDataDoesNotOverwriteRule) {
@@ -177,14 +156,10 @@ TEST(RuleTest, ParseEmptyDataDoesNotOverwriteRule) {
EXPECT_EQ(rule.GetLanguages(), copy.GetLanguages());
EXPECT_EQ(rule.GetLanguage(), copy.GetLanguage());
EXPECT_EQ(rule.GetPostalCodeFormat(), copy.GetPostalCodeFormat());
- EXPECT_EQ(rule.GetAdminAreaNameMessageId(),
- copy.GetAdminAreaNameMessageId());
- EXPECT_EQ(rule.GetInvalidAdminAreaMessageId(),
- copy.GetInvalidAdminAreaMessageId());
- EXPECT_EQ(rule.GetPostalCodeNameMessageId(),
- copy.GetPostalCodeNameMessageId());
- EXPECT_EQ(rule.GetInvalidPostalCodeMessageId(),
- copy.GetInvalidPostalCodeMessageId());
+ EXPECT_EQ(rule.GetAdminAreaNameType(),
+ copy.GetAdminAreaNameType());
+ EXPECT_EQ(rule.GetPostalCodeNameType(),
+ copy.GetPostalCodeNameType());
}
TEST(RuleTest, ParseFormatWithNewLines) {
@@ -352,14 +327,13 @@ TEST(RuleTest, ParseSubKeyTest) {
}
struct LabelData {
- LabelData(const std::string& data, int name_id, int error_id)
- : data(data), name_id(name_id), error_id(error_id) {}
+ LabelData(const std::string& data, const std::string& name_type)
+ : data(data), name_type(name_type) {}
~LabelData() {}
std::string data;
- int name_id;
- int error_id;
+ std::string name_type;
};
// Tests for parsing the postal code name.
@@ -371,21 +345,15 @@ class PostalCodeNameParseTest : public testing::TestWithParam<LabelData> {
// Verifies that a postal code name is parsed correctly.
TEST_P(PostalCodeNameParseTest, ParsedCorrectly) {
ASSERT_TRUE(rule_.ParseSerializedRule(GetParam().data));
- EXPECT_EQ(GetParam().name_id, rule_.GetPostalCodeNameMessageId());
- EXPECT_EQ(GetParam().error_id, rule_.GetInvalidPostalCodeMessageId());
- EXPECT_EQ(GetParam().error_id, rule_.GetInvalidFieldMessageId(POSTAL_CODE));
+ EXPECT_EQ(GetParam().name_type, rule_.GetPostalCodeNameType());
}
// Test parsing all postal code names.
INSTANTIATE_TEST_CASE_P(
AllPostalCodeNames, PostalCodeNameParseTest,
testing::Values(
- LabelData("{\"zip_name_type\":\"postal\"}",
- IDS_LIBADDRESSINPUT_I18N_POSTAL_CODE_LABEL,
- IDS_LIBADDRESSINPUT_I18N_INVALID_POSTAL_CODE_LABEL),
- LabelData("{\"zip_name_type\":\"zip\"}",
- IDS_LIBADDRESSINPUT_I18N_ZIP_CODE_LABEL,
- IDS_LIBADDRESSINPUT_I18N_INVALID_ZIP_CODE_LABEL)));
+ LabelData("{\"zip_name_type\":\"postal\"}", "postal"),
+ LabelData("{\"zip_name_type\":\"zip\"}", "zip")));
// Tests for parsing the administrative area name.
class AdminAreaNameParseTest : public testing::TestWithParam<LabelData> {
@@ -396,48 +364,24 @@ class AdminAreaNameParseTest : public testing::TestWithParam<LabelData> {
// Verifies that an administrative area name is parsed correctly.
TEST_P(AdminAreaNameParseTest, ParsedCorrectly) {
ASSERT_TRUE(rule_.ParseSerializedRule(GetParam().data));
- EXPECT_EQ(GetParam().name_id, rule_.GetAdminAreaNameMessageId());
- EXPECT_EQ(GetParam().error_id, rule_.GetInvalidAdminAreaMessageId());
- EXPECT_EQ(GetParam().error_id, rule_.GetInvalidFieldMessageId(ADMIN_AREA));
+ EXPECT_EQ(GetParam().name_type, rule_.GetAdminAreaNameType());
}
// Test parsing all administrative area names.
INSTANTIATE_TEST_CASE_P(
AllAdminAreaNames, AdminAreaNameParseTest,
testing::Values(
- LabelData("{\"state_name_type\":\"area\"}",
- IDS_LIBADDRESSINPUT_I18N_AREA,
- IDS_LIBADDRESSINPUT_I18N_INVALID_AREA),
- LabelData("{\"state_name_type\":\"county\"}",
- IDS_LIBADDRESSINPUT_I18N_COUNTY_LABEL,
- IDS_LIBADDRESSINPUT_I18N_INVALID_COUNTY_LABEL),
- LabelData("{\"state_name_type\":\"department\"}",
- IDS_LIBADDRESSINPUT_I18N_DEPARTMENT,
- IDS_LIBADDRESSINPUT_I18N_INVALID_DEPARTMENT),
- LabelData("{\"state_name_type\":\"district\"}",
- IDS_LIBADDRESSINPUT_I18N_DEPENDENT_LOCALITY_LABEL,
- IDS_LIBADDRESSINPUT_I18N_INVALID_DEPENDENT_LOCALITY_LABEL),
- LabelData("{\"state_name_type\":\"do_si\"}",
- IDS_LIBADDRESSINPUT_I18N_DO_SI,
- IDS_LIBADDRESSINPUT_I18N_INVALID_DO_SI),
- LabelData("{\"state_name_type\":\"emirate\"}",
- IDS_LIBADDRESSINPUT_I18N_EMIRATE,
- IDS_LIBADDRESSINPUT_I18N_INVALID_EMIRATE),
- LabelData("{\"state_name_type\":\"island\"}",
- IDS_LIBADDRESSINPUT_I18N_ISLAND,
- IDS_LIBADDRESSINPUT_I18N_INVALID_ISLAND),
- LabelData("{\"state_name_type\":\"parish\"}",
- IDS_LIBADDRESSINPUT_I18N_PARISH,
- IDS_LIBADDRESSINPUT_I18N_INVALID_PARISH),
- LabelData("{\"state_name_type\":\"prefecture\"}",
- IDS_LIBADDRESSINPUT_I18N_PREFECTURE,
- IDS_LIBADDRESSINPUT_I18N_INVALID_PREFECTURE),
- LabelData("{\"state_name_type\":\"province\"}",
- IDS_LIBADDRESSINPUT_I18N_PROVINCE,
- IDS_LIBADDRESSINPUT_I18N_INVALID_PROVINCE),
- LabelData("{\"state_name_type\":\"state\"}",
- IDS_LIBADDRESSINPUT_I18N_STATE_LABEL,
- IDS_LIBADDRESSINPUT_I18N_INVALID_STATE_LABEL)));
+ LabelData("{\"state_name_type\":\"area\"}", "area"),
+ LabelData("{\"state_name_type\":\"county\"}", "county"),
+ LabelData("{\"state_name_type\":\"department\"}", "department"),
+ LabelData("{\"state_name_type\":\"district\"}", "district"),
+ LabelData("{\"state_name_type\":\"do_si\"}", "do_si"),
+ LabelData("{\"state_name_type\":\"emirate\"}", "emirate"),
+ LabelData("{\"state_name_type\":\"island\"}", "island"),
+ LabelData("{\"state_name_type\":\"parish\"}", "parish"),
+ LabelData("{\"state_name_type\":\"prefecture\"}", "prefecture"),
+ LabelData("{\"state_name_type\":\"province\"}", "province"),
+ LabelData("{\"state_name_type\":\"state\"}", "state")));
// Verifies that an address format does not contain consecutive lines with
// multiple fields each. Such address format (e.g. {{ELEMENT, ELEMENT},
« no previous file with comments | « third_party/libaddressinput/chromium/cpp/test/address_ui_test.cc ('k') | third_party/libaddressinput/libaddressinput.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698