commit a1e0a1c5a6f60a257cec29341ae6b318550d151a
author Darin Petkov <petkov@chromium.org> Thu Aug 25 15:08:33 2011 -0700
committer Darin Petkov <petkov@chromium.org> Fri Aug 26 10:04:22 2011 -0700
tree 7e2f7d00c4c419ee967c92f0bce7bd2ccc51e410
parent bf1861b28b61d2338116e4416ac8f2a45f7045ce

shill: Register GSM modem as part of device start up.

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

Change-Id: Ie8f8a8ce4fd185226a9f55f4fcd62224e7318c3c
Reviewed-on: http://gerrit.chromium.org/gerrit/6683
Tested-by: Darin Petkov <petkov@chromium.org>
Reviewed-by: Paul Stewart <pstew@chromium.org>

cellular_unittest.cc

diff --git a/cellular_unittest.cc b/cellular_unittest.cc
index b3e59ad..ba84506 100644
--- a/cellular_unittest.cc
+++ b/cellular_unittest.cc
@@ -18,6 +18,7 @@
 #include "shill/mock_dhcp_provider.h"
 #include "shill/mock_manager.h"
 #include "shill/mock_modem_cdma_proxy.h"
+#include "shill/mock_modem_gsm_network_proxy.h"
 #include "shill/mock_modem_proxy.h"
 #include "shill/mock_modem_simple_proxy.h"
 #include "shill/mock_sockets.h"
@@ -117,6 +118,7 @@
         proxy_(new MockModemProxy()),
         simple_proxy_(new MockModemSimpleProxy()),
         cdma_proxy_(new MockModemCDMAProxy()),
+        gsm_network_proxy_(new MockModemGSMNetworkProxy()),
         proxy_factory_(this),
         dhcp_config_(new MockDHCPConfig(&control_interface_,
                                         &dispatcher_,
@@ -172,6 +174,13 @@
       return test_->cdma_proxy_.release();
     }
 
+    virtual ModemGSMNetworkProxyInterface *CreateModemGSMNetworkProxy(
+        ModemGSMNetworkProxyListener *listener,
+        const string &path,
+        const string &service) {
+      return test_->gsm_network_proxy_.release();
+    }
+
    private:
     CellularTest *test_;
   };
@@ -195,6 +204,7 @@
   scoped_ptr<MockModemProxy> proxy_;
   scoped_ptr<MockModemSimpleProxy> simple_proxy_;
   scoped_ptr<MockModemCDMAProxy> cdma_proxy_;
+  scoped_ptr<MockModemGSMNetworkProxy> gsm_network_proxy_;
   TestProxyFactory proxy_factory_;
 
   MockDHCPProvider dhcp_provider_;
@@ -325,16 +335,7 @@
             device_->GetCDMAActivationErrorString(1234));
 }
 
-TEST_F(CellularTest, Start) {
-  EXPECT_CALL(*proxy_, Enable(true)).Times(1);
-  EXPECT_CALL(*simple_proxy_, GetStatus())
-      .WillOnce(Return(DBusPropertiesMap()));
-  EXPECT_CALL(*proxy_, GetInfo()).WillOnce(Return(ModemProxyInterface::Info()));
-  device_->Start();
-  EXPECT_EQ(Cellular::kStateEnabled, device_->state_);
-}
-
-TEST_F(CellularTest, StartRegister) {
+TEST_F(CellularTest, StartCDMARegister) {
   device_->type_ = Cellular::kTypeCDMA;
   EXPECT_CALL(*proxy_, Enable(true)).Times(1);
   EXPECT_CALL(*simple_proxy_, GetStatus())
@@ -354,6 +355,19 @@
   EXPECT_EQ(flimflam::kRoamingStateHome, device_->service_->roaming_state());
 }
 
+TEST_F(CellularTest, StartGSM) {
+  device_->type_ = Cellular::kTypeGSM;
+  static const char kNetwork[] = "My Favorite GSM Network";
+  device_->selected_network_ = kNetwork;
+  EXPECT_CALL(*proxy_, Enable(true)).Times(1);
+  EXPECT_CALL(*gsm_network_proxy_, Register(kNetwork)).Times(1);
+  EXPECT_CALL(*simple_proxy_, GetStatus())
+      .WillOnce(Return(DBusPropertiesMap()));
+  EXPECT_CALL(*proxy_, GetInfo()).WillOnce(Return(ModemProxyInterface::Info()));
+  device_->Start();
+  EXPECT_EQ(Cellular::kStateEnabled, device_->state_);
+}
+
 TEST_F(CellularTest, StartConnected) {
   EXPECT_CALL(device_info_, GetFlags(device_->interface_index(), _))
       .WillOnce(Return(true));