Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(179)

Side by Side Diff: chrome/browser/chromeos/dbus/service_provider_test_helper.cc

Issue 16998003: Update CrOS to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 "chrome/browser/chromeos/dbus/service_provider_test_helper.h" 5 #include "chrome/browser/chromeos/dbus/service_provider_test_helper.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "dbus/message.h" 8 #include "dbus/message.h"
9 #include "dbus/mock_bus.h" 9 #include "dbus/mock_bus.h"
10 #include "testing/gmock/include/gmock/gmock.h" 10 #include "testing/gmock/include/gmock/gmock.h"
(...skipping 18 matching lines...) Expand all
29 29
30 void ServiceProviderTestHelper::SetUp( 30 void ServiceProviderTestHelper::SetUp(
31 const std::string& exported_method_name, 31 const std::string& exported_method_name,
32 CrosDBusService::ServiceProviderInterface* service_provider) { 32 CrosDBusService::ServiceProviderInterface* service_provider) {
33 // Create a mock bus. 33 // Create a mock bus.
34 dbus::Bus::Options options; 34 dbus::Bus::Options options;
35 options.bus_type = dbus::Bus::SYSTEM; 35 options.bus_type = dbus::Bus::SYSTEM;
36 mock_bus_ = new dbus::MockBus(options); 36 mock_bus_ = new dbus::MockBus(options);
37 37
38 // ShutdownAndBlock() will be called in TearDown(). 38 // ShutdownAndBlock() will be called in TearDown().
39 EXPECT_CALL(*mock_bus_, ShutdownAndBlock()).WillOnce(Return()); 39 EXPECT_CALL(*mock_bus_.get(), ShutdownAndBlock()).WillOnce(Return());
40 40
41 // Create a mock exported object that behaves as 41 // Create a mock exported object that behaves as
42 // org.chromium.CrosDBusService. 42 // org.chromium.CrosDBusService.
43 mock_exported_object_ = 43 mock_exported_object_ =
44 new dbus::MockExportedObject(mock_bus_.get(), 44 new dbus::MockExportedObject(mock_bus_.get(),
45 dbus::ObjectPath(kLibCrosServicePath)); 45 dbus::ObjectPath(kLibCrosServicePath));
46 46
47 // |mock_exported_object_|'s ExportMethod() will use 47 // |mock_exported_object_|'s ExportMethod() will use
48 // |MockExportedObject(). 48 // |MockExportedObject().
49 EXPECT_CALL(*mock_exported_object_, 49 EXPECT_CALL(
50 ExportMethod(kLibCrosServiceInterface, 50 *mock_exported_object_.get(),
51 exported_method_name, _, _)) 51 ExportMethod(kLibCrosServiceInterface, exported_method_name, _, _))
52 .WillOnce(Invoke(this, &ServiceProviderTestHelper::MockExportMethod)); 52 .WillOnce(Invoke(this, &ServiceProviderTestHelper::MockExportMethod));
53 53
54 // Create a mock object proxy, with which we call a method of 54 // Create a mock object proxy, with which we call a method of
55 // |mock_exported_object_|. 55 // |mock_exported_object_|.
56 mock_object_proxy_ = 56 mock_object_proxy_ =
57 new dbus::MockObjectProxy(mock_bus_.get(), 57 new dbus::MockObjectProxy(mock_bus_.get(),
58 kLibCrosServiceName, 58 kLibCrosServiceName,
59 dbus::ObjectPath(kLibCrosServicePath)); 59 dbus::ObjectPath(kLibCrosServicePath));
60 // |mock_object_proxy_|'s MockCallMethodAndBlock() will use 60 // |mock_object_proxy_|'s MockCallMethodAndBlock() will use
61 // MockCallMethodAndBlock() to return responses. 61 // MockCallMethodAndBlock() to return responses.
62 EXPECT_CALL(*mock_object_proxy_, 62 EXPECT_CALL(*mock_object_proxy_.get(),
63 MockCallMethodAndBlock( 63 MockCallMethodAndBlock(
64 AllOf( 64 AllOf(ResultOf(std::mem_fun(&dbus::MethodCall::GetInterface),
65 ResultOf( 65 kLibCrosServiceInterface),
66 std::mem_fun(&dbus::MethodCall::GetInterface), 66 ResultOf(std::mem_fun(&dbus::MethodCall::GetMember),
67 kLibCrosServiceInterface), 67 exported_method_name)),
68 ResultOf(
69 std::mem_fun(&dbus::MethodCall::GetMember),
70 exported_method_name)),
71 _)) 68 _))
72 .WillOnce(Invoke(this, 69 .WillOnce(
73 &ServiceProviderTestHelper::MockCallMethodAndBlock)); 70 Invoke(this, &ServiceProviderTestHelper::MockCallMethodAndBlock));
74 71
75 service_provider->Start(mock_exported_object_.get()); 72 service_provider->Start(mock_exported_object_.get());
76 } 73 }
77 74
78 void ServiceProviderTestHelper::TearDown() { 75 void ServiceProviderTestHelper::TearDown() {
79 mock_bus_->ShutdownAndBlock(); 76 mock_bus_->ShutdownAndBlock();
80 mock_exported_object_ = NULL; 77 mock_exported_object_ = NULL;
81 mock_object_proxy_ = NULL; 78 mock_object_proxy_ = NULL;
82 mock_bus_ = NULL; 79 mock_bus_ = NULL;
83 } 80 }
84 81
85 void ServiceProviderTestHelper::SetUpReturnSignal( 82 void ServiceProviderTestHelper::SetUpReturnSignal(
86 const std::string& interface_name, 83 const std::string& interface_name,
87 const std::string& signal_name, 84 const std::string& signal_name,
88 dbus::ObjectProxy::SignalCallback signal_callback, 85 dbus::ObjectProxy::SignalCallback signal_callback,
89 dbus::ObjectProxy::OnConnectedCallback on_connected_callback) { 86 dbus::ObjectProxy::OnConnectedCallback on_connected_callback) {
90 // |mock_exported_object_|'s SendSignal() will use 87 // |mock_exported_object_|'s SendSignal() will use
91 // MockSendSignal(). 88 // MockSendSignal().
92 EXPECT_CALL(*mock_exported_object_, SendSignal(_)) 89 EXPECT_CALL(*mock_exported_object_.get(), SendSignal(_))
93 .WillOnce(Invoke(this, &ServiceProviderTestHelper::MockSendSignal)); 90 .WillOnce(Invoke(this, &ServiceProviderTestHelper::MockSendSignal));
94 91
95 // |mock_object_proxy_|'s ConnectToSignal will use 92 // |mock_object_proxy_|'s ConnectToSignal will use
96 // MockConnectToSignal(). 93 // MockConnectToSignal().
97 EXPECT_CALL(*mock_object_proxy_, 94 EXPECT_CALL(*mock_object_proxy_.get(),
98 ConnectToSignal(interface_name, signal_name, _, _)) 95 ConnectToSignal(interface_name, signal_name, _, _))
99 .WillOnce(Invoke(this, &ServiceProviderTestHelper::MockConnectToSignal)); 96 .WillOnce(Invoke(this, &ServiceProviderTestHelper::MockConnectToSignal));
100 97
101 mock_object_proxy_->ConnectToSignal(interface_name, signal_name, 98 mock_object_proxy_->ConnectToSignal(interface_name, signal_name,
102 signal_callback, on_connected_callback); 99 signal_callback, on_connected_callback);
103 } 100 }
104 101
105 scoped_ptr<dbus::Response> ServiceProviderTestHelper::CallMethod( 102 scoped_ptr<dbus::Response> ServiceProviderTestHelper::CallMethod(
106 dbus::MethodCall* method_call) { 103 dbus::MethodCall* method_call) {
107 return mock_object_proxy_->CallMethodAndBlock( 104 return mock_object_proxy_->CallMethodAndBlock(
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 155
159 void ServiceProviderTestHelper::OnResponse( 156 void ServiceProviderTestHelper::OnResponse(
160 scoped_ptr<dbus::Response> response) { 157 scoped_ptr<dbus::Response> response) {
161 response_ = response.Pass(); 158 response_ = response.Pass();
162 response_received_ = true; 159 response_received_ = true;
163 if (message_loop_.is_running()) 160 if (message_loop_.is_running())
164 message_loop_.Quit(); 161 message_loop_.Quit();
165 } 162 }
166 163
167 } // namespace chromeos 164 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698