commit 3d27539b13590e0b149440ce017fdc401ef6e735
author Thieu Le <thieule@chromium.org> Fri Jul 20 15:32:58 2012 -0700
committer Gerrit <chrome-bot@google.com> Mon Jul 23 12:43:58 2012 -0700
tree 966fdca23c74f7539c8c089df0ef2c0103f64897
parent 3f43f432700a31526a57c413a1872284d766ac2f

shill: Check modem proxy validity before Disconnecting.

BUG=chromium-os:32668
TEST=Unit tests, cellular_Smoke, cellular_ModemControl

Change-Id: I457fe576317a89216efb203c0b90e4279e6f8c6a
Reviewed-on: https://gerrit.chromium.org/gerrit/28109
Reviewed-by: Thieu Le <thieule@chromium.org>
Tested-by: Thieu Le <thieule@chromium.org>
Commit-Ready: Thieu Le <thieule@chromium.org>

cellular_capability_universal_unittest.cc

diff --git a/cellular_capability_universal_unittest.cc b/cellular_capability_universal_unittest.cc
index f466b62..5960dad 100644
--- a/cellular_capability_universal_unittest.cc
+++ b/cellular_capability_universal_unittest.cc
@@ -148,6 +148,10 @@
     capability_->modem_simple_proxy_.reset(modem_simple_proxy_.release());
   }
 
+  void ReleaseCapabilityProxies() {
+    capability_->ReleaseProxies();
+  }
+
   MOCK_METHOD1(TestCallback, void(const Error &error));
 
  protected:
@@ -345,13 +349,23 @@
 TEST_F(CellularCapabilityUniversalTest, DisconnectModemNoBearer) {
   Error error;
   ResultCallback disconnect_callback;
-  mm1::MockModemSimpleProxy *modem_simple_proxy = modem_simple_proxy_.get();
-  EXPECT_CALL(*modem_simple_proxy,
+  EXPECT_CALL(*modem_simple_proxy_,
               Disconnect(_, _, _, CellularCapability::kTimeoutDefault))
       .Times(0);
   capability_->Disconnect(&error, disconnect_callback);
 }
 
+TEST_F(CellularCapabilityUniversalTest, DisconnectNoProxy) {
+  Error error;
+  ResultCallback disconnect_callback;
+  capability_->bearer_path_ = "/foo";
+  EXPECT_CALL(*modem_simple_proxy_,
+              Disconnect(_, _, _, CellularCapability::kTimeoutDefault))
+      .Times(0);
+  ReleaseCapabilityProxies();
+  capability_->Disconnect(&error, disconnect_callback);
+}
+
 TEST_F(CellularCapabilityUniversalTest, PropertiesChanged) {
   // Set up mock modem properties
   DBusPropertiesMap modem_properties;