Skip to content

Commit 7b7ced1

Browse files
pkastingpkasting
authored
Merge pull request #236 from google/FF0F89A9FFB90668CB5E5C968FD01756
(AUTOMATIC) opensource update
2 parents f471330 + 45d0149 commit 7b7ced1

21 files changed

+917
-724
lines changed

‎android/src/main/java/com/android/i18n/addressinput/AddressAutocompleteController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
7373
(AddressAutocompletePrediction)
7474
adapter.getItem(position).getAutocompletePrediction();
7575

76-
(new AsyncTask<AddressAutocompletePrediction, Void, AddressData>() {
76+
new AsyncTask<AddressAutocompletePrediction, Void, AddressData>() {
7777
@Override
7878
protected AddressData doInBackground(
7979
AddressAutocompletePrediction... predictions) {
@@ -91,7 +91,7 @@ protected void onPostExecute(AddressData addressData) {
9191
Log.e(TAG, "AddressData: " + addressData.toString());
9292
listener.onAddressSelected(addressData);
9393
}
94-
})
94+
}
9595
.execute(prediction);
9696
} else {
9797
Log.i(TAG, "No onAddressSelected listener.");

‎android/src/main/java/com/android/i18n/addressinput/AddressUiComponent.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,7 @@ enum UiComponent {
6565
this.uiType = UiComponent.EDIT;
6666
}
6767

68-
/**
69-
* Initializes the candidatesList, and set the uiType and parentId.
70-
* @param candidatesList
71-
*/
68+
/** Initializes the candidatesList, and set the uiType and parentId. */
7269
void initializeCandidatesList(List<RegionData> candidatesList) {
7370
this.candidatesList = candidatesList;
7471
if (candidatesList.size() > 1) {

‎android/src/main/java/com/android/i18n/addressinput/AddressWidget.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ private void buildCountryListBox() {
493493
}
494494

495495
private String getLocalCountryName(String regionCode) {
496-
return (new Locale("", regionCode)).getDisplayCountry(Locale.getDefault());
496+
return new Locale("", regionCode).getDisplayCountry(Locale.getDefault());
497497
}
498498

499499
private AddressSpinnerInfo findSpinnerByView(View view) {

‎android/src/main/java/com/android/i18n/addressinput/AndroidAsyncRequestApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public void run() {
9999

100100
@Override public void requestObject(String url, AsyncCallback callback, int timeoutMillis) {
101101
try {
102-
(new AsyncHttp(stringToUrl(url), callback, timeoutMillis)).start();
102+
new AsyncHttp(stringToUrl(url), callback, timeoutMillis).start();
103103
} catch (MalformedURLException e) {
104104
callback.onFailure();
105105
}

‎cpp/src/address_field_util.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ void ParseFormatRule(const std::string& format,
7373
}
7474
if (prev < next) {
7575
// Push back preceding literal.
76-
elements->push_back(FormatElement(std::string(prev, next)));
76+
elements->emplace_back(std::string(prev, next));
7777
}
7878
if ((prev = ++next) == format.end()) {
7979
// Move forward and check we haven't reached the end of the string
@@ -83,14 +83,14 @@ void ParseFormatRule(const std::string& format,
8383
// Process the token after the %.
8484
AddressField field;
8585
if (*next == 'n') {
86-
elements->push_back(FormatElement());
86+
elements->emplace_back();
8787
} else if (ParseFieldToken(*next, &field)) {
88-
elements->push_back(FormatElement(field));
88+
elements->emplace_back(field);
8989
} // Else it's an unknown token, we ignore it.
9090
}
9191
// Push back any trailing literal.
9292
if (prev != format.end()) {
93-
elements->push_back(FormatElement(std::string(prev, format.end())));
93+
elements->emplace_back(std::string(prev, format.end()));
9494
}
9595
}
9696

‎cpp/src/localization.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ void PushBackUrl(const std::string& url, std::vector<std::string>* parameters) {
3535
assert(parameters != nullptr);
3636
// TODO: HTML-escape the "url".
3737
parameters->push_back("<a href=\"" + url + "\">");
38-
parameters->push_back("</a>");
38+
parameters->emplace_back("</a>");
3939
}
4040

4141
} // namespace

‎cpp/test/address_data_test.cc

Lines changed: 70 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,16 @@ using i18n::addressinput::ORGANIZATION;
3636
using i18n::addressinput::RECIPIENT;
3737

3838
TEST(AddressDataTest, GetFieldValue) {
39-
AddressData address;
40-
address.region_code = "rrr";
41-
address.administrative_area = "sss";
42-
address.locality = "ccc";
43-
address.dependent_locality = "ddd";
44-
address.sorting_code = "xxx";
45-
address.postal_code = "zzz";
46-
address.organization = "ooo";
47-
address.recipient = "nnn";
39+
const AddressData address{
40+
.region_code = "rrr",
41+
.administrative_area = "sss",
42+
.locality = "ccc",
43+
.dependent_locality = "ddd",
44+
.postal_code = "zzz",
45+
.sorting_code = "xxx",
46+
.organization = "ooo",
47+
.recipient = "nnn",
48+
};
4849

4950
EXPECT_EQ(address.region_code,
5051
address.GetFieldValue(COUNTRY));
@@ -65,9 +66,10 @@ TEST(AddressDataTest, GetFieldValue) {
6566
}
6667

6768
TEST(AddressDataTest, GetRepeatedFieldValue) {
68-
AddressData address;
69-
address.address_line.emplace_back("aaa");
70-
address.address_line.emplace_back("222");
69+
const AddressData address{.address_line{
70+
"aaa",
71+
"222",
72+
}};
7173
EXPECT_EQ(address.address_line,
7274
address.GetRepeatedFieldValue(STREET_ADDRESS));
7375
}
@@ -85,15 +87,17 @@ TEST(AddressDataTest, IsFieldEmpty) {
8587
EXPECT_TRUE(address.IsFieldEmpty(ORGANIZATION));
8688
EXPECT_TRUE(address.IsFieldEmpty(RECIPIENT));
8789

88-
address.region_code = "rrr";
89-
address.administrative_area = "sss";
90-
address.locality = "ccc";
91-
address.dependent_locality = "ddd";
92-
address.sorting_code = "xxx";
93-
address.postal_code = "zzz";
94-
address.address_line.emplace_back("aaa");
95-
address.organization = "ooo";
96-
address.recipient = "nnn";
90+
address = {
91+
.region_code = "rrr",
92+
.address_line{"aaa"},
93+
.administrative_area = "sss",
94+
.locality = "ccc",
95+
.dependent_locality = "ddd",
96+
.postal_code = "zzz",
97+
.sorting_code = "xxx",
98+
.organization = "ooo",
99+
.recipient = "nnn",
100+
};
97101

98102
EXPECT_FALSE(address.IsFieldEmpty(COUNTRY));
99103
EXPECT_FALSE(address.IsFieldEmpty(ADMIN_AREA));
@@ -128,35 +132,41 @@ TEST(AddressDataTest, IsFieldEmptyVector) {
128132
}
129133

130134
TEST(AddressDataTest, IsFieldEmptyVectorWhitespace) {
131-
AddressData address;
132-
address.address_line.emplace_back(" ");
133-
address.address_line.emplace_back(" ");
134-
address.address_line.emplace_back(" ");
135+
AddressData address{.address_line{
136+
" ",
137+
" ",
138+
" ",
139+
}};
135140
EXPECT_TRUE(address.IsFieldEmpty(STREET_ADDRESS));
136-
address.address_line.clear();
137-
address.address_line.emplace_back("abc");
141+
address.address_line = {
142+
"abc",
143+
};
138144
EXPECT_FALSE(address.IsFieldEmpty(STREET_ADDRESS));
139-
address.address_line.clear();
140-
address.address_line.emplace_back(" ");
141-
address.address_line.emplace_back(" b ");
142-
address.address_line.emplace_back(" ");
145+
address.address_line = {
146+
" ",
147+
" b ",
148+
" ",
149+
};
143150
EXPECT_FALSE(address.IsFieldEmpty(STREET_ADDRESS));
144151
}
145152

146153
TEST(AddressDataTest, StreamFunction) {
147154
std::ostringstream oss;
148-
AddressData address;
149-
address.address_line.emplace_back("Line 1");
150-
address.address_line.emplace_back("Line 2");
151-
address.recipient = "N";
152-
address.region_code = "R";
153-
address.postal_code = "Z";
154-
address.administrative_area = "S";
155-
address.locality = "C";
156-
address.dependent_locality = "D";
157-
address.sorting_code = "X";
158-
address.language_code = "zh-Hant";
159-
address.organization = "O";
155+
const AddressData address{
156+
.region_code = "R",
157+
.address_line{
158+
"Line 1",
159+
"Line 2",
160+
},
161+
.administrative_area = "S",
162+
.locality = "C",
163+
.dependent_locality = "D",
164+
.postal_code = "Z",
165+
.sorting_code = "X",
166+
.language_code = "zh-Hant",
167+
.organization = "O",
168+
.recipient = "N",
169+
};
160170
oss << address;
161171
EXPECT_EQ("region_code: \"R\"\n"
162172
"administrative_area: \"S\"\n"
@@ -172,18 +182,21 @@ TEST(AddressDataTest, StreamFunction) {
172182
}
173183

174184
TEST(AddressDataTest, TestEquals) {
175-
AddressData address;
176-
address.address_line.emplace_back("Line 1");
177-
address.address_line.emplace_back("Line 2");
178-
address.recipient = "N";
179-
address.region_code = "R";
180-
address.postal_code = "Z";
181-
address.administrative_area = "S";
182-
address.locality = "C";
183-
address.dependent_locality = "D";
184-
address.sorting_code = "X";
185-
address.organization = "O";
186-
address.language_code = "zh-Hant";
185+
const AddressData address{
186+
.region_code = "R",
187+
.address_line{
188+
"Line 1",
189+
"Line 2",
190+
},
191+
.administrative_area = "S",
192+
.locality = "C",
193+
.dependent_locality = "D",
194+
.postal_code = "Z",
195+
.sorting_code = "X",
196+
.language_code = "zh-Hant",
197+
.organization = "O",
198+
.recipient = "N",
199+
};
187200

188201
AddressData clone = address;
189202

@@ -195,13 +208,13 @@ TEST(AddressDataTest, TestEquals) {
195208
#ifndef NDEBUG
196209

197210
TEST(AddressDataTest, GetFieldValueInvalid) {
198-
AddressData address;
211+
const AddressData address;
199212
ASSERT_DEATH_IF_SUPPORTED(address.GetFieldValue(STREET_ADDRESS),
200213
"ssertion.*failed");
201214
}
202215

203216
TEST(AddressDataTest, GetVectorFieldValueInvalid) {
204-
AddressData address;
217+
const AddressData address;
205218
ASSERT_DEATH_IF_SUPPORTED(address.GetRepeatedFieldValue(COUNTRY),
206219
"ssertion.*failed");
207220
}

‎cpp/test/address_field_util_test.cc

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -40,27 +40,28 @@ TEST(AddressFieldUtilTest, FormatParseNewline) {
4040
std::vector<FormatElement> actual;
4141
ParseFormatRule("%O%n%N%n%A%nAX-%Z %C%nÅLAND", &actual);
4242

43-
std::vector<FormatElement> expected;
44-
expected.emplace_back(ORGANIZATION);
45-
expected.emplace_back();
46-
expected.emplace_back(RECIPIENT);
47-
expected.emplace_back();
48-
expected.emplace_back(STREET_ADDRESS);
49-
expected.emplace_back();
50-
expected.emplace_back("AX-");
51-
expected.emplace_back(POSTAL_CODE);
52-
expected.emplace_back(" ");
53-
expected.emplace_back(LOCALITY);
54-
expected.emplace_back();
55-
expected.emplace_back("ÅLAND");
43+
const std::vector<FormatElement> expected{
44+
FormatElement{ORGANIZATION},
45+
FormatElement{},
46+
FormatElement{RECIPIENT},
47+
FormatElement{},
48+
FormatElement{STREET_ADDRESS},
49+
FormatElement{},
50+
FormatElement{"AX-"},
51+
FormatElement{POSTAL_CODE},
52+
FormatElement{" "},
53+
FormatElement{LOCALITY},
54+
FormatElement{},
55+
FormatElement{"ÅLAND"},
56+
};
5657

5758
EXPECT_EQ(expected, actual);
5859
}
5960

6061
TEST(AddressFieldUtilTest, FormatUnknownTokenIsIgnored) {
6162
std::vector<FormatElement> actual;
6263
ParseFormatRule("%1%R", &actual); // %1 is not supported.
63-
std::vector<FormatElement> expected{FormatElement(COUNTRY)};
64+
const std::vector<FormatElement> expected{FormatElement{COUNTRY}};
6465
EXPECT_EQ(expected, actual);
6566
}
6667

@@ -80,9 +81,10 @@ TEST(AddressFieldUtilTest, RequiredParseDefault) {
8081
std::vector<AddressField> actual;
8182
ParseAddressFieldsRequired("AC", &actual);
8283

83-
std::vector<AddressField> expected;
84-
expected.push_back(STREET_ADDRESS);
85-
expected.push_back(LOCALITY);
84+
const std::vector<AddressField> expected{
85+
STREET_ADDRESS,
86+
LOCALITY,
87+
};
8688

8789
EXPECT_EQ(expected, actual);
8890
}

0 commit comments

Comments
 (0)