dbus: Use stubs for some clients and utils for MockDBusThreadManagerWithoutGMock

chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h"
 
+#include "chromeos/dbus/bluetooth_adapter_client.h"
+#include "chromeos/dbus/bluetooth_device_client.h"
+#include "chromeos/dbus/bluetooth_manager_client.h"
 #include "chromeos/dbus/dbus_thread_manager_observer.h"
 #include "chromeos/dbus/fake_bluetooth_adapter_client.h"
 #include "chromeos/dbus/fake_bluetooth_agent_manager_client.h"
 #include "chromeos/dbus/fake_bluetooth_device_client.h"
 #include "chromeos/dbus/fake_bluetooth_input_client.h"
 #include "chromeos/dbus/fake_bluetooth_profile_manager_client.h"
 #include "chromeos/dbus/fake_cros_disks_client.h"
+#include "chromeos/dbus/fake_power_manager_client.h"
+#include "chromeos/dbus/fake_update_engine_client.h"
 #include "chromeos/dbus/ibus/mock_ibus_client.h"
 #include "chromeos/dbus/ibus/mock_ibus_config_client.h"
 #include "chromeos/dbus/ibus/mock_ibus_engine_factory_service.h"
 #include "chromeos/dbus/ibus/mock_ibus_engine_service.h"
 #include "chromeos/dbus/ibus/mock_ibus_input_context_client.h"
 #include "chromeos/dbus/ibus/mock_ibus_panel_service.h"
+#include "chromeos/dbus/image_burner_client.h"
+#include "chromeos/dbus/power_policy_controller.h"
+#include "chromeos/dbus/session_manager_client.h"
+#include "chromeos/dbus/system_clock_client.h"
 
 namespace chromeos {
 
 MockDBusThreadManagerWithoutGMock::MockDBusThreadManagerWithoutGMock()
   : fake_bluetooth_adapter_client_(new FakeBluetoothAdapterClient()),
     fake_bluetooth_agent_manager_client_(new FakeBluetoothAgentManagerClient()),
     fake_bluetooth_device_client_(new FakeBluetoothDeviceClient()),
     fake_bluetooth_input_client_(new FakeBluetoothInputClient()),
     fake_bluetooth_profile_manager_client_(
         new FakeBluetoothProfileManagerClient()),
     fake_cros_disks_client_(new FakeCrosDisksClient),
+    fake_power_manager_client_(new FakePowerManagerClient),
+    fake_update_engine_client_(new FakeUpdateEngineClient),
     mock_ibus_client_(new MockIBusClient),
+    mock_ibus_config_client_(new MockIBusConfigClient),
     mock_ibus_input_context_client_(new MockIBusInputContextClient),
+    mock_ibus_panel_service_(new MockIBusPanelService),
+    stub_bluetooth_manager_client_(
+        BluetoothManagerClient::Create(STUB_DBUS_CLIENT_IMPLEMENTATION, NULL)),
+    stub_bluetooth_adapter_client_(
+        BluetoothAdapterClient::Create(STUB_DBUS_CLIENT_IMPLEMENTATION, NULL,
+                                       stub_bluetooth_manager_client_.get())),
+    stub_bluetooth_device_client_(
+        BluetoothDeviceClient::Create(STUB_DBUS_CLIENT_IMPLEMENTATION, NULL,
+                                      stub_bluetooth_adapter_client_.get())),
+    stub_image_burner_client_(
+        ImageBurnerClient::Create(STUB_DBUS_CLIENT_IMPLEMENTATION, NULL)),
+    stub_session_manager_client_(
+        SessionManagerClient::Create(STUB_DBUS_CLIENT_IMPLEMENTATION, NULL)),
+    stub_system_clock_client_(
+        SystemClockClient::Create(STUB_DBUS_CLIENT_IMPLEMENTATION, NULL)),

[satorux1, 2013/04/25 07:42:03]

using stubs sounds may be questionable. for now, could you remove them in this
patch?

[Haruki Sato, 2013/04/25 07:51:47]

Do you mean we can add them when necessary? or
Are you suggesting to add empty fakes for these?

[satorux1, 2013/04/25 07:57:03]

For the new bluetooth code, keybuk@ stopped providing Stub* classes. Please take
a look at https://chromiumcodereview.appspot.com/14048007 (ex.
fake_bluetooth_input_client.h)

I think we should follow this fashion. 

     ibus_bus_(NULL) {
+  power_policy_controller_.reset(
+      new PowerPolicyController(this, fake_power_manager_client_.get()));
 }
 
 MockDBusThreadManagerWithoutGMock::~MockDBusThreadManagerWithoutGMock() {
   FOR_EACH_OBSERVER(DBusThreadManagerObserver, observers_,
                     OnDBusThreadManagerDestroying(this));
 }
 
 void MockDBusThreadManagerWithoutGMock::AddObserver(
     DBusThreadManagerObserver* observer) {
   DCHECK(observer);
@@ skipping 16 matching lines @@
 dbus::Bus* MockDBusThreadManagerWithoutGMock::GetSystemBus() {
   return NULL;
 }
 
 dbus::Bus* MockDBusThreadManagerWithoutGMock::GetIBusBus() {
   return ibus_bus_;
 }
 
 BluetoothAdapterClient*
     MockDBusThreadManagerWithoutGMock::GetBluetoothAdapterClient() {
-  NOTIMPLEMENTED();
-  return NULL;
+  return stub_bluetooth_adapter_client_.get();
 }
 
 BluetoothDeviceClient*
     MockDBusThreadManagerWithoutGMock::GetBluetoothDeviceClient() {
-  NOTIMPLEMENTED();
-  return NULL;
+  return stub_bluetooth_device_client_.get();
 }
 
 BluetoothInputClient*
     MockDBusThreadManagerWithoutGMock::GetBluetoothInputClient() {
   NOTIMPLEMENTED();
   return NULL;
 }
 
 BluetoothManagerClient*
     MockDBusThreadManagerWithoutGMock::GetBluetoothManagerClient() {
-  NOTIMPLEMENTED();
-  return NULL;
+  return stub_bluetooth_manager_client_.get();
 }
 
 BluetoothNodeClient*
     MockDBusThreadManagerWithoutGMock::GetBluetoothNodeClient() {
   NOTIMPLEMENTED();
   return NULL;
 }
 
 CrasAudioClient* MockDBusThreadManagerWithoutGMock::GetCrasAudioClient() {
   NOTIMPLEMENTED();
@@ skipping 70 matching lines @@
   NOTIMPLEMENTED();
   return NULL;
 }
 
 GsmSMSClient* MockDBusThreadManagerWithoutGMock::GetGsmSMSClient() {
   NOTIMPLEMENTED();
   return NULL;
 }
 
 ImageBurnerClient* MockDBusThreadManagerWithoutGMock::GetImageBurnerClient() {
-  NOTIMPLEMENTED();
-  return NULL;
+  return stub_image_burner_client_.get();
 }
 
 IntrospectableClient*
     MockDBusThreadManagerWithoutGMock::GetIntrospectableClient() {
   NOTIMPLEMENTED();
   return NULL;
 }
 
 ModemMessagingClient*
     MockDBusThreadManagerWithoutGMock::GetModemMessagingClient() {
   NOTIMPLEMENTED();
   return NULL;
 }
 
 PermissionBrokerClient*
     MockDBusThreadManagerWithoutGMock::GetPermissionBrokerClient() {
   NOTIMPLEMENTED();
   return NULL;
 }
 
 PowerManagerClient* MockDBusThreadManagerWithoutGMock::GetPowerManagerClient() {
-  NOTIMPLEMENTED();
-  return NULL;
+  return fake_power_manager_client_.get();
 }
 
 PowerPolicyController*
 MockDBusThreadManagerWithoutGMock::GetPowerPolicyController() {
-  NOTIMPLEMENTED();
-  return NULL;
+  return power_policy_controller_.get();
 }
 
 SessionManagerClient*
     MockDBusThreadManagerWithoutGMock::GetSessionManagerClient() {
-  NOTIMPLEMENTED();
-  return NULL;
+  return stub_session_manager_client_.get();
 }
 
 SMSClient* MockDBusThreadManagerWithoutGMock::GetSMSClient() {
   NOTIMPLEMENTED();
   return NULL;
 }
 
 SystemClockClient* MockDBusThreadManagerWithoutGMock::GetSystemClockClient() {
-  NOTIMPLEMENTED();
-  return NULL;
+  return stub_system_clock_client_.get();
 }
 
 UpdateEngineClient* MockDBusThreadManagerWithoutGMock::GetUpdateEngineClient() {
-  NOTIMPLEMENTED();
-  return NULL;
+  return fake_update_engine_client_.get();
 }
 
 BluetoothOutOfBandClient*
     MockDBusThreadManagerWithoutGMock::GetBluetoothOutOfBandClient() {
   NOTIMPLEMENTED();
   return NULL;
 }
 
 IBusClient* MockDBusThreadManagerWithoutGMock::GetIBusClient() {
   return mock_ibus_client_.get();
@@ skipping 20 matching lines @@
 
 void MockDBusThreadManagerWithoutGMock::RemoveIBusEngineService(
     const dbus::ObjectPath& object_path) {
 }
 
 IBusPanelService* MockDBusThreadManagerWithoutGMock::GetIBusPanelService() {
   return mock_ibus_panel_service_.get();
 }
 
 }  // namespace chromeos