commit c90fe52d7eed164b63f9a3af4bcb505ee78d3f43
author Darin Petkov <petkov@chromium.org> Fri Jul 15 13:59:47 2011 -0700
committer Darin Petkov <petkov@chromium.org> Tue Jul 19 10:00:35 2011 -0700
tree 447e7a8937b6dfc99cfd01902e2ca5ae23c5aac5
parent af57195acad7aebca521e2d67bd58f4c0abb676b

shill: Create mockable ModemManagerProxy on appearance of new ModemManagers.

BUG=chromium-os:17649
TEST=unit tests, tested on device

Change-Id: Id9e6500168d63493eb94bd7939e379b964bef063
Reviewed-on: http://gerrit.chromium.org/gerrit/4269
Tested-by: Darin Petkov <petkov@chromium.org>
Reviewed-by: Chris Masone <cmasone@chromium.org>

modem_manager_unittest.cc

diff --git a/modem_manager_unittest.cc b/modem_manager_unittest.cc
index c7c83d0..89362f7 100644
--- a/modem_manager_unittest.cc
+++ b/modem_manager_unittest.cc
@@ -7,8 +7,11 @@
 #include "shill/manager.h"
 #include "shill/mock_control.h"
 #include "shill/mock_glib.h"
+#include "shill/mock_modem_manager_proxy.h"
 #include "shill/modem_manager.h"
+#include "shill/proxy_factory.h"
 
+using std::string;
 using testing::_;
 using testing::Return;
 using testing::StrEq;
@@ -25,13 +28,34 @@
                        &control_interface_,
                        &dispatcher_,
                        &manager_,
-                       &glib_) {}
+                       &glib_),
+        proxy_factory_(&proxy_) {
+    ProxyFactory::set_factory(&proxy_factory_);
+  }
 
   virtual void TearDown() {
     modem_manager_.watcher_id_ = 0;
+    ModemManagerProxyInterface *proxy = modem_manager_.proxy_.release();
+    EXPECT_TRUE(proxy == NULL || proxy == &proxy_);
+    ProxyFactory::set_factory(NULL);
   }
 
  protected:
+  class TestProxyFactory : public ProxyFactory {
+   public:
+    TestProxyFactory(ModemManagerProxyInterface *proxy) : proxy_(proxy) {}
+
+    virtual ModemManagerProxyInterface *CreateModemManagerProxy(
+        ModemManager *manager,
+        const string &path,
+        const string &service) {
+      return proxy_;
+    }
+
+   private:
+    ModemManagerProxyInterface *proxy_;
+  };
+
   static const char kService[];
   static const char kPath[];
 
@@ -40,6 +64,8 @@
   EventDispatcher dispatcher_;
   Manager manager_;
   ModemManager modem_manager_;
+  MockModemManagerProxy proxy_;
+  TestProxyFactory proxy_factory_;
 };
 
 const char ModemManagerTest::kService[] = "test.dbus.service";