[go: nahoru, domu]
Skip to content

Commit

Permalink
(AUTOMATIC) opensource update
Browse files Browse the repository at this point in the history 
PiperOrigin-RevId: 512860160
  • Loading branch information
@battre
battre authored and Dominic Battre committed Mar 20, 2023
1 parent f471330 commit 45d0149
Show file tree
Hide file tree
Showing 21 changed files with 917 additions and 724 deletions.
4 changes: 2 additions & 2 deletions android/src/main/java/com/android/i18n/addressinput/AddressAutocompleteController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
(AddressAutocompletePrediction)
adapter.getItem(position).getAutocompletePrediction();

(new AsyncTask<AddressAutocompletePrediction, Void, AddressData>() {
new AsyncTask<AddressAutocompletePrediction, Void, AddressData>() {
@Override
protected AddressData doInBackground(
AddressAutocompletePrediction... predictions) {
Expand All @@ -91,7 +91,7 @@ protected void onPostExecute(AddressData addressData) {
Log.e(TAG, "AddressData: " + addressData.toString());
listener.onAddressSelected(addressData);
}
})
}
.execute(prediction);
} else {
Log.i(TAG, "No onAddressSelected listener.");
Expand Down
5 changes: 1 addition & 4 deletions android/src/main/java/com/android/i18n/addressinput/AddressUiComponent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,7 @@ enum UiComponent {
this.uiType = UiComponent.EDIT;
}

/**
* Initializes the candidatesList, and set the uiType and parentId.
* @param candidatesList
*/
/** Initializes the candidatesList, and set the uiType and parentId. */
void initializeCandidatesList(List<RegionData> candidatesList) {
this.candidatesList = candidatesList;
if (candidatesList.size() > 1) {
Expand Down
2 changes: 1 addition & 1 deletion android/src/main/java/com/android/i18n/addressinput/AddressWidget.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ private void buildCountryListBox() {
}

private String getLocalCountryName(String regionCode) {
return (new Locale("", regionCode)).getDisplayCountry(Locale.getDefault());
return new Locale("", regionCode).getDisplayCountry(Locale.getDefault());
}

private AddressSpinnerInfo findSpinnerByView(View view) {
Expand Down
2 changes: 1 addition & 1 deletion android/src/main/java/com/android/i18n/addressinput/AndroidAsyncRequestApi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public void run() {

@Override public void requestObject(String url, AsyncCallback callback, int timeoutMillis) {
try {
(new AsyncHttp(stringToUrl(url), callback, timeoutMillis)).start();
new AsyncHttp(stringToUrl(url), callback, timeoutMillis).start();
} catch (MalformedURLException e) {
callback.onFailure();
}
Expand Down
8 changes: 4 additions & 4 deletions cpp/src/address_field_util.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ void ParseFormatRule(const std::string& format,
}
if (prev < next) {
// Push back preceding literal.
elements->push_back(FormatElement(std::string(prev, next)));
elements->emplace_back(std::string(prev, next));
}
if ((prev = ++next) == format.end()) {
// Move forward and check we haven't reached the end of the string
Expand All @@ -83,14 +83,14 @@ void ParseFormatRule(const std::string& format,
// Process the token after the %.
AddressField field;
if (*next == 'n') {
elements->push_back(FormatElement());
elements->emplace_back();
} else if (ParseFieldToken(*next, &field)) {
elements->push_back(FormatElement(field));
elements->emplace_back(field);
} // Else it's an unknown token, we ignore it.
}
// Push back any trailing literal.
if (prev != format.end()) {
elements->push_back(FormatElement(std::string(prev, format.end())));
elements->emplace_back(std::string(prev, format.end()));
}
}

Expand Down
2 changes: 1 addition & 1 deletion cpp/src/localization.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ void PushBackUrl(const std::string& url, std::vector<std::string>* parameters) {
assert(parameters != nullptr);
// TODO: HTML-escape the "url".
parameters->push_back("<a href=\"" + url + "\">");
parameters->push_back("</a>");
parameters->emplace_back("</a>");
}

} // namespace
Expand Down
127 changes: 70 additions & 57 deletions cpp/test/address_data_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,16 @@ using i18n::addressinput::ORGANIZATION;
using i18n::addressinput::RECIPIENT;

TEST(AddressDataTest, GetFieldValue) {
AddressData address;
address.region_code = "rrr";
address.administrative_area = "sss";
address.locality = "ccc";
address.dependent_locality = "ddd";
address.sorting_code = "xxx";
address.postal_code = "zzz";
address.organization = "ooo";
address.recipient = "nnn";
const AddressData address{
.region_code = "rrr",
.administrative_area = "sss",
.locality = "ccc",
.dependent_locality = "ddd",
.postal_code = "zzz",
.sorting_code = "xxx",
.organization = "ooo",
.recipient = "nnn",
};

EXPECT_EQ(address.region_code,
address.GetFieldValue(COUNTRY));
Expand All @@ -65,9 +66,10 @@ TEST(AddressDataTest, GetFieldValue) {
}

TEST(AddressDataTest, GetRepeatedFieldValue) {
AddressData address;
address.address_line.emplace_back("aaa");
address.address_line.emplace_back("222");
const AddressData address{.address_line{
"aaa",
"222",
}};
EXPECT_EQ(address.address_line,
address.GetRepeatedFieldValue(STREET_ADDRESS));
}
Expand All @@ -85,15 +87,17 @@ TEST(AddressDataTest, IsFieldEmpty) {
EXPECT_TRUE(address.IsFieldEmpty(ORGANIZATION));
EXPECT_TRUE(address.IsFieldEmpty(RECIPIENT));

address.region_code = "rrr";
address.administrative_area = "sss";
address.locality = "ccc";
address.dependent_locality = "ddd";
address.sorting_code = "xxx";
address.postal_code = "zzz";
address.address_line.emplace_back("aaa");
address.organization = "ooo";
address.recipient = "nnn";
address = {
.region_code = "rrr",
.address_line{"aaa"},
.administrative_area = "sss",
.locality = "ccc",
.dependent_locality = "ddd",
.postal_code = "zzz",
.sorting_code = "xxx",
.organization = "ooo",
.recipient = "nnn",
};

EXPECT_FALSE(address.IsFieldEmpty(COUNTRY));
EXPECT_FALSE(address.IsFieldEmpty(ADMIN_AREA));
Expand Down Expand Up @@ -128,35 +132,41 @@ TEST(AddressDataTest, IsFieldEmptyVector) {
}

TEST(AddressDataTest, IsFieldEmptyVectorWhitespace) {
AddressData address;
address.address_line.emplace_back(" ");
address.address_line.emplace_back(" ");
address.address_line.emplace_back(" ");
AddressData address{.address_line{
" ",
" ",
" ",
}};
EXPECT_TRUE(address.IsFieldEmpty(STREET_ADDRESS));
address.address_line.clear();
address.address_line.emplace_back("abc");
address.address_line = {
"abc",
};
EXPECT_FALSE(address.IsFieldEmpty(STREET_ADDRESS));
address.address_line.clear();
address.address_line.emplace_back(" ");
address.address_line.emplace_back(" b ");
address.address_line.emplace_back(" ");
address.address_line = {
" ",
" b ",
" ",
};
EXPECT_FALSE(address.IsFieldEmpty(STREET_ADDRESS));
}

TEST(AddressDataTest, StreamFunction) {
std::ostringstream oss;
AddressData address;
address.address_line.emplace_back("Line 1");
address.address_line.emplace_back("Line 2");
address.recipient = "N";
address.region_code = "R";
address.postal_code = "Z";
address.administrative_area = "S";
address.locality = "C";
address.dependent_locality = "D";
address.sorting_code = "X";
address.language_code = "zh-Hant";
address.organization = "O";
const AddressData address{
.region_code = "R",
.address_line{
"Line 1",
"Line 2",
},
.administrative_area = "S",
.locality = "C",
.dependent_locality = "D",
.postal_code = "Z",
.sorting_code = "X",
.language_code = "zh-Hant",
.organization = "O",
.recipient = "N",
};
oss << address;
EXPECT_EQ("region_code: \"R\"\n"
"administrative_area: \"S\"\n"
Expand All @@ -172,18 +182,21 @@ TEST(AddressDataTest, StreamFunction) {
}

TEST(AddressDataTest, TestEquals) {
AddressData address;
address.address_line.emplace_back("Line 1");
address.address_line.emplace_back("Line 2");
address.recipient = "N";
address.region_code = "R";
address.postal_code = "Z";
address.administrative_area = "S";
address.locality = "C";
address.dependent_locality = "D";
address.sorting_code = "X";
address.organization = "O";
address.language_code = "zh-Hant";
const AddressData address{
.region_code = "R",
.address_line{
"Line 1",
"Line 2",
},
.administrative_area = "S",
.locality = "C",
.dependent_locality = "D",
.postal_code = "Z",
.sorting_code = "X",
.language_code = "zh-Hant",
.organization = "O",
.recipient = "N",
};

AddressData clone = address;

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

TEST(AddressDataTest, GetFieldValueInvalid) {
AddressData address;
const AddressData address;
ASSERT_DEATH_IF_SUPPORTED(address.GetFieldValue(STREET_ADDRESS),
"ssertion.*failed");
}

TEST(AddressDataTest, GetVectorFieldValueInvalid) {
AddressData address;
const AddressData address;
ASSERT_DEATH_IF_SUPPORTED(address.GetRepeatedFieldValue(COUNTRY),
"ssertion.*failed");
}
Expand Down
36 changes: 19 additions & 17 deletions cpp/test/address_field_util_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,27 +40,28 @@ TEST(AddressFieldUtilTest, FormatParseNewline) {
std::vector<FormatElement> actual;
ParseFormatRule("%O%n%N%n%A%nAX-%Z %C%nÅLAND", &actual);

std::vector<FormatElement> expected;
expected.emplace_back(ORGANIZATION);
expected.emplace_back();
expected.emplace_back(RECIPIENT);
expected.emplace_back();
expected.emplace_back(STREET_ADDRESS);
expected.emplace_back();
expected.emplace_back("AX-");
expected.emplace_back(POSTAL_CODE);
expected.emplace_back(" ");
expected.emplace_back(LOCALITY);
expected.emplace_back();
expected.emplace_back("ÅLAND");
const std::vector<FormatElement> expected{
FormatElement{ORGANIZATION},
FormatElement{},
FormatElement{RECIPIENT},
FormatElement{},
FormatElement{STREET_ADDRESS},
FormatElement{},
FormatElement{"AX-"},
FormatElement{POSTAL_CODE},
FormatElement{" "},
FormatElement{LOCALITY},
FormatElement{},
FormatElement{"ÅLAND"},
};

EXPECT_EQ(expected, actual);
}

TEST(AddressFieldUtilTest, FormatUnknownTokenIsIgnored) {
std::vector<FormatElement> actual;
ParseFormatRule("%1%R", &actual); // %1 is not supported.
std::vector<FormatElement> expected{FormatElement(COUNTRY)};
const std::vector<FormatElement> expected{FormatElement{COUNTRY}};
EXPECT_EQ(expected, actual);
}

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

std::vector<AddressField> expected;
expected.push_back(STREET_ADDRESS);
expected.push_back(LOCALITY);
const std::vector<AddressField> expected{
STREET_ADDRESS,
LOCALITY,
};

EXPECT_EQ(expected, actual);
}
Expand Down
Loading

0 comments on commit 45d0149

Please sign in to comment.