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/values.h" | 6 #include "base/values.h" |
7 #include "chromeos/dbus/flimflam_client_unittest_base.h" | 7 #include "chromeos/dbus/flimflam_client_unittest_base.h" |
8 #include "chromeos/dbus/flimflam_manager_client.h" | 8 #include "chromeos/dbus/flimflam_manager_client.h" |
9 #include "dbus/message.h" | 9 #include "dbus/message.h" |
10 #include "dbus/object_path.h" | 10 #include "dbus/object_path.h" |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
92 flimflam::kSecurityProperty, | 92 flimflam::kSecurityProperty, |
93 base::Value::CreateStringValue(flimflam::kSecurityPsk)); | 93 base::Value::CreateStringValue(flimflam::kSecurityPsk)); |
94 return properties; | 94 return properties; |
95 } | 95 } |
96 | 96 |
97 } // namespace | 97 } // namespace |
98 | 98 |
99 class FlimflamManagerClientTest : public FlimflamClientUnittestBase { | 99 class FlimflamManagerClientTest : public FlimflamClientUnittestBase { |
100 public: | 100 public: |
101 FlimflamManagerClientTest() | 101 FlimflamManagerClientTest() |
102 : FlimflamClientUnittestBase(flimflam::kFlimflamManagerInterface) { | 102 : FlimflamClientUnittestBase( |
| 103 flimflam::kFlimflamManagerInterface, |
| 104 dbus::ObjectPath(flimflam::kFlimflamServicePath)) { |
103 } | 105 } |
104 | 106 |
105 virtual void SetUp() { | 107 virtual void SetUp() { |
106 FlimflamClientUnittestBase::SetUp(); | 108 FlimflamClientUnittestBase::SetUp(); |
107 // Create a client with the mock bus. | 109 // Create a client with the mock bus. |
108 client_.reset(FlimflamManagerClient::Create(REAL_DBUS_CLIENT_IMPLEMENTATION, | 110 client_.reset(FlimflamManagerClient::Create(REAL_DBUS_CLIENT_IMPLEMENTATION, |
109 mock_bus_)); | 111 mock_bus_)); |
110 // Run the message loop to run the signal connection result callback. | 112 // Run the message loop to run the signal connection result callback. |
111 message_loop_.RunAllPending(); | 113 message_loop_.RunAllPending(); |
112 } | 114 } |
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
253 PrepareForMethodCall(flimflam::kGetServiceFunction, | 255 PrepareForMethodCall(flimflam::kGetServiceFunction, |
254 base::Bind(&ExpectDictionaryValueArgument, arg.get()), | 256 base::Bind(&ExpectDictionaryValueArgument, arg.get()), |
255 response.get()); | 257 response.get()); |
256 // Call method. | 258 // Call method. |
257 client_->GetService(*arg, base::Bind(&ExpectObjectPathResult, object_path)); | 259 client_->GetService(*arg, base::Bind(&ExpectObjectPathResult, object_path)); |
258 // Run the message loop. | 260 // Run the message loop. |
259 message_loop_.RunAllPending(); | 261 message_loop_.RunAllPending(); |
260 } | 262 } |
261 | 263 |
262 } // namespace chromeos | 264 } // namespace chromeos |
OLD | NEW |