| OLD | NEW |
| 1 // Copyright (C) 2014 Google Inc. | 1 // Copyright (C) 2014 Google Inc. |
| 2 // | 2 // |
| 3 // Licensed under the Apache License, Version 2.0 (the "License"); | 3 // Licensed under the Apache License, Version 2.0 (the "License"); |
| 4 // you may not use this file except in compliance with the License. | 4 // you may not use this file except in compliance with the License. |
| 5 // You may obtain a copy of the License at | 5 // You may obtain a copy of the License at |
| 6 // | 6 // |
| 7 // http://www.apache.org/licenses/LICENSE-2.0 | 7 // http://www.apache.org/licenses/LICENSE-2.0 |
| 8 // | 8 // |
| 9 // Unless required by applicable law or agreed to in writing, software | 9 // Unless required by applicable law or agreed to in writing, software |
| 10 // distributed under the License is distributed on an "AS IS" BASIS, | 10 // distributed under the License is distributed on an "AS IS" BASIS, |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 address.address_lines.end()); | 78 address.address_lines.end()); |
| 79 expected.push_back(address.postal_code + " " + address.locality); | 79 expected.push_back(address.postal_code + " " + address.locality); |
| 80 expected.push_back(address.administrative_area); | 80 expected.push_back(address.administrative_area); |
| 81 | 81 |
| 82 EXPECT_EQ(expected, actual); | 82 EXPECT_EQ(expected, actual); |
| 83 } | 83 } |
| 84 | 84 |
| 85 TEST(AddressDataTest, FormatForDisplayJp) { | 85 TEST(AddressDataTest, FormatForDisplayJp) { |
| 86 AddressData address; | 86 AddressData address; |
| 87 address.country_code = "JP"; | 87 address.country_code = "JP"; |
| 88 address.language_code = "ja"; |
| 88 address.administrative_area = "東京都"; | 89 address.administrative_area = "東京都"; |
| 89 address.locality = "渋谷区"; | 90 address.locality = "渋谷区"; |
| 90 address.postal_code = "150-8512"; | 91 address.postal_code = "150-8512"; |
| 91 address.address_lines.push_back("桜丘町26-1"); | 92 address.address_lines.push_back("桜丘町26-1"); |
| 92 address.address_lines.push_back("セルリアンタワー6階"); | 93 address.address_lines.push_back("セルリアンタワー6階"); |
| 93 address.organization = "グーグル株式会社"; | 94 address.organization = "グーグル株式会社"; |
| 94 address.recipient = "村上 美紀"; | 95 address.recipient = "村上 美紀"; |
| 95 | 96 |
| 96 std::vector<std::string> actual; | 97 std::vector<std::string> actual; |
| 97 address.FormatForDisplay(&actual); | 98 address.FormatForDisplay(&actual); |
| 98 | 99 |
| 99 std::vector<std::string> expected; | 100 std::vector<std::string> expected; |
| 100 expected.push_back("〒" + address.postal_code); | 101 expected.push_back("〒" + address.postal_code); |
| 101 expected.push_back(address.administrative_area + address.locality); | 102 expected.push_back(address.administrative_area + address.locality); |
| 102 expected.insert(expected.end(), | 103 expected.insert(expected.end(), |
| 103 address.address_lines.begin(), | 104 address.address_lines.begin(), |
| 104 address.address_lines.end()); | 105 address.address_lines.end()); |
| 105 expected.push_back(address.organization); | 106 expected.push_back(address.organization); |
| 106 expected.push_back(address.recipient); | 107 expected.push_back(address.recipient); |
| 107 | 108 |
| 108 EXPECT_EQ(expected, actual); | 109 EXPECT_EQ(expected, actual); |
| 109 } | 110 } |
| 110 | 111 |
| 112 TEST(AddressDataTest, FormatForDisplayJpLatn) { |
| 113 AddressData address; |
| 114 address.country_code = "JP"; |
| 115 address.language_code = "ja-latn"; |
| 116 address.administrative_area = "Tokyo"; |
| 117 address.locality = "Shibuya-ku"; |
| 118 address.postal_code = "150-8512"; |
| 119 address.address_lines.push_back("26-1 Sakuragaoka-cho"); |
| 120 address.address_lines.push_back("Cerulean Tower 6F"); |
| 121 address.organization = "Google Japan Inc."; |
| 122 address.recipient = "Miki Murakami"; |
| 123 |
| 124 std::vector<std::string> actual; |
| 125 address.FormatForDisplay(&actual); |
| 126 |
| 127 std::vector<std::string> expected; |
| 128 expected.push_back(address.recipient); |
| 129 expected.push_back(address.organization); |
| 130 expected.insert(expected.end(), |
| 131 address.address_lines.begin(), |
| 132 address.address_lines.end()); |
| 133 expected.push_back(address.locality + ", "+ address.administrative_area); |
| 134 expected.push_back(address.postal_code); |
| 135 |
| 136 EXPECT_EQ(expected, actual); |
| 137 } |
| 138 |
| 111 TEST(AddressDataTest, FormatForDisplayWithStreetCi) { | 139 TEST(AddressDataTest, FormatForDisplayWithStreetCi) { |
| 112 AddressData address; | 140 AddressData address; |
| 113 address.country_code = "CI"; | 141 address.country_code = "CI"; |
| 114 address.address_lines.push_back("Street Line 1"); | 142 address.address_lines.push_back("Street Line 1"); |
| 115 address.locality = "City Name"; | 143 address.locality = "City Name"; |
| 116 address.sorting_code = "123CEDEX"; | 144 address.sorting_code = "123CEDEX"; |
| 117 | 145 |
| 118 std::vector<std::string> actual; | 146 std::vector<std::string> actual; |
| 119 address.FormatForDisplay(&actual); | 147 address.FormatForDisplay(&actual); |
| 120 | 148 |
| (...skipping 19 matching lines...) Expand all Loading... |
| 140 std::vector<std::string> expected( | 168 std::vector<std::string> expected( |
| 141 1, | 169 1, |
| 142 address.sorting_code + " " + | 170 address.sorting_code + " " + |
| 143 address.locality + " " + | 171 address.locality + " " + |
| 144 address.sorting_code); | 172 address.sorting_code); |
| 145 | 173 |
| 146 EXPECT_EQ(expected, actual); | 174 EXPECT_EQ(expected, actual); |
| 147 } | 175 } |
| 148 | 176 |
| 149 } // namespace | 177 } // namespace |
| OLD | NEW |