OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/bind.h" | 5 #include "base/bind.h" |
6 #include "base/memory/scoped_ptr.h" | 6 #include "base/memory/scoped_ptr.h" |
7 #include "base/values.h" | 7 #include "base/values.h" |
8 #include "chrome/browser/chromeos/cros/cros_network_functions.h" | 8 #include "chrome/browser/chromeos/cros/cros_network_functions.h" |
9 #include "chrome/browser/chromeos/cros/gvalue_util.h" | 9 #include "chrome/browser/chromeos/cros/gvalue_util.h" |
10 #include "chrome/browser/chromeos/cros/mock_chromeos_network.h" | 10 #include "chrome/browser/chromeos/cros/mock_chromeos_network.h" |
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
169 void* object) { | 169 void* object) { |
170 OnRequestNetworkProperties2(callback, object); | 170 OnRequestNetworkProperties2(callback, object); |
171 } | 171 } |
172 | 172 |
173 // Does nothing. Used as an argument. | 173 // Does nothing. Used as an argument. |
174 static void OnNetworkAction(void* object, | 174 static void OnNetworkAction(void* object, |
175 const char* path, | 175 const char* path, |
176 NetworkMethodErrorType error, | 176 NetworkMethodErrorType error, |
177 const char* error_message) {} | 177 const char* error_message) {} |
178 | 178 |
| 179 // Does nothing. Used as an argument. |
| 180 static void OnDataPlansUpdate(void* object, |
| 181 const char* modem_service_path, |
| 182 const CellularDataPlanList* dataplan) {} |
| 183 |
| 184 // Does nothing. Used as an argument. |
| 185 static void OnSmsReceived(void* object, |
| 186 const char* modem_device_path, |
| 187 const SMS* message) {} |
| 188 |
179 protected: | 189 protected: |
180 ScopedGValue argument_gvalue_; | 190 ScopedGValue argument_gvalue_; |
181 ScopedGHashTable argument_ghash_table_; | 191 ScopedGHashTable argument_ghash_table_; |
182 ScopedGHashTable result_ghash_table_; | 192 ScopedGHashTable result_ghash_table_; |
183 base::Callback<void(const char* path, | 193 base::Callback<void(const char* path, |
184 const char* key, | 194 const char* key, |
185 const GValue* gvalue)> property_changed_callback_; | 195 const GValue* gvalue)> property_changed_callback_; |
186 }; | 196 }; |
187 | 197 |
188 TEST_F(CrosNetworkFunctionsLibcrosTest, CrosActivateCellularModem) { | 198 TEST_F(CrosNetworkFunctionsLibcrosTest, CrosActivateCellularModem) { |
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
359 property_changed_callback_.Run(path.c_str(), key.c_str(), gvalue.get()); | 369 property_changed_callback_.Run(path.c_str(), key.c_str(), gvalue.get()); |
360 | 370 |
361 // Stop monitoring. | 371 // Stop monitoring. |
362 EXPECT_CALL(*MockChromeOSNetwork::Get(), | 372 EXPECT_CALL(*MockChromeOSNetwork::Get(), |
363 DisconnectNetworkPropertiesMonitor(_)).Times(1); | 373 DisconnectNetworkPropertiesMonitor(_)).Times(1); |
364 delete watcher; | 374 delete watcher; |
365 } | 375 } |
366 | 376 |
367 TEST_F(CrosNetworkFunctionsLibcrosTest, CrosMonitorCellularDataPlan) { | 377 TEST_F(CrosNetworkFunctionsLibcrosTest, CrosMonitorCellularDataPlan) { |
368 MonitorDataPlanCallback callback = | 378 MonitorDataPlanCallback callback = |
369 reinterpret_cast<MonitorDataPlanCallback>(42); // Dummy value. | 379 &CrosNetworkFunctionsLibcrosTest::OnDataPlansUpdate; |
370 void* object = reinterpret_cast<void*>(84); // Dummy value. | 380 void* object = this; |
371 | 381 |
372 // Start monitoring. | 382 // Start monitoring. |
373 EXPECT_CALL(*MockChromeOSNetwork::Get(), | 383 EXPECT_CALL(*MockChromeOSNetwork::Get(), |
374 MonitorCellularDataPlan(callback, object)).Times(1); | 384 MonitorCellularDataPlan(callback, object)).Times(1); |
375 CrosNetworkWatcher* watcher = CrosMonitorCellularDataPlan(callback, object); | 385 CrosNetworkWatcher* watcher = CrosMonitorCellularDataPlan(callback, object); |
376 | 386 |
377 // Stop monitoring. | 387 // Stop monitoring. |
378 EXPECT_CALL(*MockChromeOSNetwork::Get(), | 388 EXPECT_CALL(*MockChromeOSNetwork::Get(), |
379 DisconnectDataPlanUpdateMonitor(_)).Times(1); | 389 DisconnectDataPlanUpdateMonitor(_)).Times(1); |
380 delete watcher; | 390 delete watcher; |
381 } | 391 } |
382 | 392 |
383 TEST_F(CrosNetworkFunctionsLibcrosTest, CrosMonitorSMS) { | 393 TEST_F(CrosNetworkFunctionsLibcrosTest, CrosMonitorSMS) { |
384 const std::string modem_device_path = "/modem/device/path"; | 394 const std::string modem_device_path = "/modem/device/path"; |
385 MonitorSMSCallback callback = | 395 MonitorSMSCallback callback = &CrosNetworkFunctionsLibcrosTest::OnSmsReceived; |
386 reinterpret_cast<MonitorSMSCallback>(42); // Dummy value. | 396 void* object = this; |
387 void* object = reinterpret_cast<void*>(84); // Dummy value. | |
388 | 397 |
389 // Start monitoring. | 398 // Start monitoring. |
390 EXPECT_CALL(*MockChromeOSNetwork::Get(), | 399 EXPECT_CALL(*MockChromeOSNetwork::Get(), |
391 MonitorSMS(StrEq(modem_device_path), callback, object)) | 400 MonitorSMS(StrEq(modem_device_path), callback, object)) |
392 .Times(1); | 401 .Times(1); |
393 CrosNetworkWatcher* watcher = CrosMonitorSMS( | 402 CrosNetworkWatcher* watcher = CrosMonitorSMS( |
394 modem_device_path, callback, object); | 403 modem_device_path, callback, object); |
395 | 404 |
396 // Stop monitoring. | 405 // Stop monitoring. |
397 EXPECT_CALL(*MockChromeOSNetwork::Get(), | 406 EXPECT_CALL(*MockChromeOSNetwork::Get(), |
398 DisconnectSMSMonitor(_)).Times(1); | 407 DisconnectSMSMonitor(_)).Times(1); |
399 delete watcher; | 408 delete watcher; |
400 } | 409 } |
401 | 410 |
| 411 TEST_F(CrosNetworkFunctionsLibcrosTest, CrosRequestNetworkServiceConnect) { |
| 412 const std::string service_path = "service path"; |
| 413 void* object = this; |
| 414 EXPECT_CALL(*MockChromeOSNetwork::Get(), |
| 415 RequestNetworkServiceConnect(StrEq(service_path), |
| 416 &OnNetworkAction, |
| 417 object)).Times(1); |
| 418 CrosRequestNetworkServiceConnect(service_path, &OnNetworkAction, object); |
| 419 } |
| 420 |
402 TEST_F(CrosNetworkFunctionsLibcrosTest, CrosRequestNetworkManagerProperties) { | 421 TEST_F(CrosNetworkFunctionsLibcrosTest, CrosRequestNetworkManagerProperties) { |
403 const std::string key1 = "key1"; | 422 const std::string key1 = "key1"; |
404 const std::string value1 = "value1"; | 423 const std::string value1 = "value1"; |
405 const std::string key2 = "key.2."; | 424 const std::string key2 = "key.2."; |
406 const std::string value2 = "value2"; | 425 const std::string value2 = "value2"; |
407 // Create result value. | 426 // Create result value. |
408 base::DictionaryValue result; | 427 base::DictionaryValue result; |
409 result.SetWithoutPathExpansion(key1, base::Value::CreateStringValue(value1)); | 428 result.SetWithoutPathExpansion(key1, base::Value::CreateStringValue(value1)); |
410 result.SetWithoutPathExpansion(key2, base::Value::CreateStringValue(value2)); | 429 result.SetWithoutPathExpansion(key2, base::Value::CreateStringValue(value2)); |
411 result_ghash_table_.reset( | 430 result_ghash_table_.reset( |
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
598 } | 617 } |
599 | 618 |
600 TEST_F(CrosNetworkFunctionsLibcrosTest, CrosRequestNetworkDeviceEnable) { | 619 TEST_F(CrosNetworkFunctionsLibcrosTest, CrosRequestNetworkDeviceEnable) { |
601 const bool kEnable = true; | 620 const bool kEnable = true; |
602 EXPECT_CALL(*MockChromeOSNetwork::Get(), | 621 EXPECT_CALL(*MockChromeOSNetwork::Get(), |
603 RequestNetworkDeviceEnable(StrEq(flimflam::kTypeWifi), kEnable)) | 622 RequestNetworkDeviceEnable(StrEq(flimflam::kTypeWifi), kEnable)) |
604 .Times(1); | 623 .Times(1); |
605 CrosRequestNetworkDeviceEnable(flimflam::kTypeWifi, kEnable); | 624 CrosRequestNetworkDeviceEnable(flimflam::kTypeWifi, kEnable); |
606 } | 625 } |
607 | 626 |
| 627 TEST_F(CrosNetworkFunctionsLibcrosTest, CrosRequestRequirePin) { |
| 628 const std::string device_path = "/device/path"; |
| 629 const std::string pin = "123456"; |
| 630 const bool kEnable = true; |
| 631 void* object = this; |
| 632 EXPECT_CALL(*MockChromeOSNetwork::Get(), RequestRequirePin( |
| 633 StrEq(device_path), StrEq(pin), kEnable, &OnNetworkAction, object)) |
| 634 .Times(1); |
| 635 CrosRequestRequirePin(device_path, pin, kEnable, &OnNetworkAction, object); |
| 636 } |
| 637 |
| 638 TEST_F(CrosNetworkFunctionsLibcrosTest, CrosRequestEnterPin) { |
| 639 const std::string device_path = "/device/path"; |
| 640 const std::string pin = "123456"; |
| 641 void* object = this; |
| 642 EXPECT_CALL(*MockChromeOSNetwork::Get(), RequestEnterPin( |
| 643 StrEq(device_path), StrEq(pin), &OnNetworkAction, object)).Times(1); |
| 644 CrosRequestEnterPin(device_path, pin, &OnNetworkAction, object); |
| 645 } |
| 646 |
| 647 TEST_F(CrosNetworkFunctionsLibcrosTest, CrosRequestUnblockPin) { |
| 648 const std::string device_path = "/device/path"; |
| 649 const std::string unblock_code = "987654"; |
| 650 const std::string pin = "123456"; |
| 651 void* object = this; |
| 652 EXPECT_CALL(*MockChromeOSNetwork::Get(), RequestUnblockPin( |
| 653 StrEq(device_path), StrEq(unblock_code), StrEq(pin), &OnNetworkAction, |
| 654 object)).Times(1); |
| 655 CrosRequestUnblockPin(device_path, unblock_code, pin, &OnNetworkAction, |
| 656 object); |
| 657 } |
| 658 |
| 659 TEST_F(CrosNetworkFunctionsLibcrosTest, CrosRequestChangePin) { |
| 660 const std::string device_path = "/device/path"; |
| 661 const std::string old_pin = "123456"; |
| 662 const std::string new_pin = "234567"; |
| 663 void* object = this; |
| 664 EXPECT_CALL(*MockChromeOSNetwork::Get(), RequestChangePin( |
| 665 StrEq(device_path), StrEq(old_pin), StrEq(new_pin), &OnNetworkAction, |
| 666 object)).Times(1); |
| 667 CrosRequestChangePin(device_path, old_pin, new_pin, &OnNetworkAction, object); |
| 668 } |
| 669 |
608 TEST_F(CrosNetworkFunctionsLibcrosTest, CrosProposeScan) { | 670 TEST_F(CrosNetworkFunctionsLibcrosTest, CrosProposeScan) { |
609 const std::string device_path = "/device/path"; | 671 const std::string device_path = "/device/path"; |
610 EXPECT_CALL(*MockChromeOSNetwork::Get(), ProposeScan(StrEq(device_path))) | 672 EXPECT_CALL(*MockChromeOSNetwork::Get(), ProposeScan(StrEq(device_path))) |
611 .Times(1); | 673 .Times(1); |
612 CrosProposeScan(device_path); | 674 CrosProposeScan(device_path); |
613 } | 675 } |
614 | 676 |
| 677 TEST_F(CrosNetworkFunctionsLibcrosTest, CrosRequestCellularRegister) { |
| 678 const std::string device_path = "/device/path"; |
| 679 const std::string network_id = "networkid"; |
| 680 void* object = this; |
| 681 EXPECT_CALL(*MockChromeOSNetwork::Get(), RequestCellularRegister( |
| 682 StrEq(device_path), StrEq(network_id), &OnNetworkAction, object)) |
| 683 .Times(1); |
| 684 CrosRequestCellularRegister(device_path, network_id, &OnNetworkAction, |
| 685 object); |
| 686 } |
| 687 |
615 TEST_F(CrosNetworkFunctionsLibcrosTest, CrosAddIPConfig) { | 688 TEST_F(CrosNetworkFunctionsLibcrosTest, CrosAddIPConfig) { |
616 const std::string device_path = "/device/path"; | 689 const std::string device_path = "/device/path"; |
617 EXPECT_CALL(*MockChromeOSNetwork::Get(), | 690 EXPECT_CALL(*MockChromeOSNetwork::Get(), |
618 AddIPConfig(StrEq(device_path), IPCONFIG_TYPE_DHCP)).Times(1); | 691 AddIPConfig(StrEq(device_path), IPCONFIG_TYPE_DHCP)).Times(1); |
619 CrosAddIPConfig(device_path, IPCONFIG_TYPE_DHCP); | 692 CrosAddIPConfig(device_path, IPCONFIG_TYPE_DHCP); |
620 } | 693 } |
621 | 694 |
622 TEST_F(CrosNetworkFunctionsLibcrosTest, CrosRemoveIPConfig) { | 695 TEST_F(CrosNetworkFunctionsLibcrosTest, CrosRemoveIPConfig) { |
623 IPConfig config = {}; | 696 IPConfig config = {}; |
624 config.path = "/path"; | 697 config.path = "/path"; |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
731 } | 804 } |
732 | 805 |
733 // Handles responses for GetEntry method calls. | 806 // Handles responses for GetEntry method calls. |
734 void OnGetEntry( | 807 void OnGetEntry( |
735 const dbus::ObjectPath& profile_path, | 808 const dbus::ObjectPath& profile_path, |
736 const std::string& entry_path, | 809 const std::string& entry_path, |
737 const FlimflamClientHelper::DictionaryValueCallback& callback) { | 810 const FlimflamClientHelper::DictionaryValueCallback& callback) { |
738 callback.Run(DBUS_METHOD_CALL_SUCCESS, *dictionary_value_result_); | 811 callback.Run(DBUS_METHOD_CALL_SUCCESS, *dictionary_value_result_); |
739 } | 812 } |
740 | 813 |
| 814 // Mock NetworkActionCallback. |
| 815 MOCK_METHOD4(MockNetworkActionCallback, void(void* object, |
| 816 const char* path, |
| 817 NetworkMethodErrorType error, |
| 818 const char* error_message)); |
| 819 static void MockNetworkActionCallbackThunk(void* object, |
| 820 const char* path, |
| 821 NetworkMethodErrorType error, |
| 822 const char* error_message) { |
| 823 static_cast<CrosNetworkFunctionsTest*>(object)->MockNetworkActionCallback( |
| 824 object, path, error, error_message); |
| 825 } |
| 826 |
741 protected: | 827 protected: |
742 MockCashewClient* mock_cashew_client_; | 828 MockCashewClient* mock_cashew_client_; |
743 MockFlimflamDeviceClient* mock_device_client_; | 829 MockFlimflamDeviceClient* mock_device_client_; |
744 MockFlimflamIPConfigClient* mock_ipconfig_client_; | 830 MockFlimflamIPConfigClient* mock_ipconfig_client_; |
745 MockFlimflamManagerClient* mock_manager_client_; | 831 MockFlimflamManagerClient* mock_manager_client_; |
746 MockFlimflamProfileClient* mock_profile_client_; | 832 MockFlimflamProfileClient* mock_profile_client_; |
747 MockFlimflamServiceClient* mock_service_client_; | 833 MockFlimflamServiceClient* mock_service_client_; |
748 const base::DictionaryValue* dictionary_value_result_; | 834 const base::DictionaryValue* dictionary_value_result_; |
749 }; | 835 }; |
750 | 836 |
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1119 EXPECT_CALL(*mock_manager_client_, | 1205 EXPECT_CALL(*mock_manager_client_, |
1120 EnableTechnology(flimflam::kTypeWifi, _)).Times(1); | 1206 EnableTechnology(flimflam::kTypeWifi, _)).Times(1); |
1121 CrosRequestNetworkDeviceEnable(flimflam::kTypeWifi, kEnable); | 1207 CrosRequestNetworkDeviceEnable(flimflam::kTypeWifi, kEnable); |
1122 | 1208 |
1123 const bool kDisable = false; | 1209 const bool kDisable = false; |
1124 EXPECT_CALL(*mock_manager_client_, | 1210 EXPECT_CALL(*mock_manager_client_, |
1125 DisableTechnology(flimflam::kTypeWifi, _)).Times(1); | 1211 DisableTechnology(flimflam::kTypeWifi, _)).Times(1); |
1126 CrosRequestNetworkDeviceEnable(flimflam::kTypeWifi, kDisable); | 1212 CrosRequestNetworkDeviceEnable(flimflam::kTypeWifi, kDisable); |
1127 } | 1213 } |
1128 | 1214 |
| 1215 TEST_F(CrosNetworkFunctionsTest, CrosRequestRequirePin) { |
| 1216 const std::string device_path = "/device/path"; |
| 1217 const std::string pin = "123456"; |
| 1218 const bool kRequire = true; |
| 1219 void* object = this; |
| 1220 |
| 1221 // Set expectations. |
| 1222 base::Closure callback; |
| 1223 EXPECT_CALL(*mock_device_client_, |
| 1224 RequirePin(dbus::ObjectPath(device_path), pin, kRequire, _, _)) |
| 1225 .WillOnce(SaveArg<3>(&callback)); |
| 1226 EXPECT_CALL(*this, MockNetworkActionCallback( |
| 1227 object, StrEq(device_path), NETWORK_METHOD_ERROR_NONE, _)).Times(1); |
| 1228 CrosRequestRequirePin(device_path, pin, kRequire, |
| 1229 &MockNetworkActionCallbackThunk, this); |
| 1230 // Run saved callback. |
| 1231 callback.Run(); |
| 1232 } |
| 1233 |
| 1234 TEST_F(CrosNetworkFunctionsTest, CrosRequestEnterPin) { |
| 1235 const std::string device_path = "/device/path"; |
| 1236 const std::string pin = "123456"; |
| 1237 void* object = this; |
| 1238 |
| 1239 // Set expectations. |
| 1240 base::Closure callback; |
| 1241 EXPECT_CALL(*mock_device_client_, |
| 1242 EnterPin(dbus::ObjectPath(device_path), pin, _, _)) |
| 1243 .WillOnce(SaveArg<2>(&callback)); |
| 1244 EXPECT_CALL(*this, MockNetworkActionCallback( |
| 1245 object, StrEq(device_path), NETWORK_METHOD_ERROR_NONE, _)).Times(1); |
| 1246 CrosRequestEnterPin(device_path, pin, &MockNetworkActionCallbackThunk, this); |
| 1247 // Run saved callback. |
| 1248 callback.Run(); |
| 1249 } |
| 1250 |
| 1251 TEST_F(CrosNetworkFunctionsTest, CrosRequestUnblockPin) { |
| 1252 const std::string device_path = "/device/path"; |
| 1253 const std::string unblock_code = "987654"; |
| 1254 const std::string pin = "123456"; |
| 1255 void* object = this; |
| 1256 |
| 1257 // Set expectations. |
| 1258 base::Closure callback; |
| 1259 EXPECT_CALL( |
| 1260 *mock_device_client_, |
| 1261 UnblockPin(dbus::ObjectPath(device_path), unblock_code, pin, _, _)) |
| 1262 .WillOnce(SaveArg<3>(&callback)); |
| 1263 EXPECT_CALL(*this, MockNetworkActionCallback( |
| 1264 object, StrEq(device_path), NETWORK_METHOD_ERROR_NONE, _)).Times(1); |
| 1265 CrosRequestUnblockPin(device_path, unblock_code, pin, |
| 1266 &MockNetworkActionCallbackThunk, object); |
| 1267 // Run saved callback. |
| 1268 callback.Run(); |
| 1269 } |
| 1270 |
| 1271 TEST_F(CrosNetworkFunctionsTest, CrosRequestChangePin) { |
| 1272 const std::string device_path = "/device/path"; |
| 1273 const std::string old_pin = "123456"; |
| 1274 const std::string new_pin = "234567"; |
| 1275 void* object = this; |
| 1276 |
| 1277 // Set expectations. |
| 1278 base::Closure callback; |
| 1279 EXPECT_CALL(*mock_device_client_, |
| 1280 ChangePin(dbus::ObjectPath(device_path), old_pin, new_pin, _, _)) |
| 1281 .WillOnce(SaveArg<3>(&callback)); |
| 1282 EXPECT_CALL(*this, MockNetworkActionCallback( |
| 1283 object, StrEq(device_path), NETWORK_METHOD_ERROR_NONE, _)).Times(1); |
| 1284 CrosRequestChangePin(device_path, old_pin, new_pin, |
| 1285 &MockNetworkActionCallbackThunk, object); |
| 1286 // Run saved callback. |
| 1287 callback.Run(); |
| 1288 } |
| 1289 |
1129 TEST_F(CrosNetworkFunctionsTest, CrosProposeScan) { | 1290 TEST_F(CrosNetworkFunctionsTest, CrosProposeScan) { |
1130 const std::string device_path = "/device/path"; | 1291 const std::string device_path = "/device/path"; |
1131 EXPECT_CALL(*mock_device_client_, | 1292 EXPECT_CALL(*mock_device_client_, |
1132 ProposeScan(dbus::ObjectPath(device_path), _)).Times(1); | 1293 ProposeScan(dbus::ObjectPath(device_path), _)).Times(1); |
1133 CrosProposeScan(device_path); | 1294 CrosProposeScan(device_path); |
1134 } | 1295 } |
1135 | 1296 |
| 1297 TEST_F(CrosNetworkFunctionsTest, CrosRequestCellularRegister) { |
| 1298 const std::string device_path = "/device/path"; |
| 1299 const std::string network_id = "networkid"; |
| 1300 void* object = this; |
| 1301 |
| 1302 // Set expectations. |
| 1303 base::Closure callback; |
| 1304 EXPECT_CALL(*mock_device_client_, |
| 1305 Register(dbus::ObjectPath(device_path), network_id, _, _)) |
| 1306 .WillOnce(SaveArg<2>(&callback)); |
| 1307 EXPECT_CALL(*this, MockNetworkActionCallback( |
| 1308 object, StrEq(device_path), NETWORK_METHOD_ERROR_NONE, _)).Times(1); |
| 1309 CrosRequestCellularRegister(device_path, network_id, |
| 1310 &MockNetworkActionCallbackThunk, object); |
| 1311 // Run saved callback. |
| 1312 callback.Run(); |
| 1313 } |
| 1314 |
1136 TEST_F(CrosNetworkFunctionsTest, CrosAddIPConfig) { | 1315 TEST_F(CrosNetworkFunctionsTest, CrosAddIPConfig) { |
1137 const std::string device_path = "/device/path"; | 1316 const std::string device_path = "/device/path"; |
1138 const dbus::ObjectPath result_path("/result/path"); | 1317 const dbus::ObjectPath result_path("/result/path"); |
1139 EXPECT_CALL(*mock_device_client_, | 1318 EXPECT_CALL(*mock_device_client_, |
1140 CallAddIPConfigAndBlock(dbus::ObjectPath(device_path), | 1319 CallAddIPConfigAndBlock(dbus::ObjectPath(device_path), |
1141 flimflam::kTypeDHCP)) | 1320 flimflam::kTypeDHCP)) |
1142 .WillOnce(Return(result_path)); | 1321 .WillOnce(Return(result_path)); |
1143 EXPECT_TRUE(CrosAddIPConfig(device_path, IPCONFIG_TYPE_DHCP)); | 1322 EXPECT_TRUE(CrosAddIPConfig(device_path, IPCONFIG_TYPE_DHCP)); |
1144 } | 1323 } |
1145 | 1324 |
(...skipping 12 matching lines...) Expand all Loading... |
1158 const std::string string2 = "string2"; | 1337 const std::string string2 = "string2"; |
1159 base::DictionaryValue value; | 1338 base::DictionaryValue value; |
1160 value.SetString(key1, string1); | 1339 value.SetString(key1, string1); |
1161 value.SetString(key2, string2); | 1340 value.SetString(key2, string2); |
1162 EXPECT_CALL(*mock_manager_client_, ConfigureService(IsEqualTo(&value), _)) | 1341 EXPECT_CALL(*mock_manager_client_, ConfigureService(IsEqualTo(&value), _)) |
1163 .Times(1); | 1342 .Times(1); |
1164 CrosConfigureService(value); | 1343 CrosConfigureService(value); |
1165 } | 1344 } |
1166 | 1345 |
1167 } // namespace chromeos | 1346 } // namespace chromeos |
OLD | NEW |