commit 9f06c870229b00cdd19224cb12c4202de65772ae
author Prathmesh Prabhu <pprabhu@chromium.org> Thu Nov 21 14:08:23 2013 -0800
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Thu Dec 05 07:46:51 2013 +0000
tree 840c0431e552916635ade61cda1203c6778d8c32
parent eadf89f62c747f0b4caff74df37e821e419f68e9

shill: Consolidate Cellular DBus properties in the Cellular class.

BUG=chromium:321854
TEST=(1) Run platform2 unittests.
     (2) Run network_3g, network_ui, network3g_pseudomodem suite on 3G, LTE, and
         CDMA modems.

Change-Id: I5717c5de8597f8bfac15b3947f455c6e44344929
Reviewed-on: https://chromium-review.googlesource.com/177700
Reviewed-by: Ben Chan <benchan@chromium.org>
Tested-by: Prathmesh Prabhu <pprabhu@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>

cellular_capability_universal_cdma_unittest.cc

diff --git a/cellular_capability_universal_cdma_unittest.cc b/cellular_capability_universal_cdma_unittest.cc
index c495671..681fd76 100644
--- a/cellular_capability_universal_cdma_unittest.cc
+++ b/cellular_capability_universal_cdma_unittest.cc
@@ -212,23 +212,23 @@
 
   SetUp();
 
-  EXPECT_TRUE(capability_->meid().empty());
-  EXPECT_TRUE(capability_->esn().empty());
+  EXPECT_TRUE(cellular_->meid().empty());
+  EXPECT_TRUE(cellular_->esn().empty());
 
   // Changing properties on wrong interface will not have an effect
   capability_->OnDBusPropertiesChanged(MM_DBUS_INTERFACE_MODEM,
                                        modem_cdma_properties,
                                        vector<string>());
-  EXPECT_TRUE(capability_->meid().empty());
-  EXPECT_TRUE(capability_->esn().empty());
+  EXPECT_TRUE(cellular_->meid().empty());
+  EXPECT_TRUE(cellular_->esn().empty());
 
   // Changing properties on the right interface gets reflected in the
   // capabilities object
   capability_->OnDBusPropertiesChanged(MM_DBUS_INTERFACE_MODEM_MODEMCDMA,
                                        modem_cdma_properties,
                                        vector<string>());
-  EXPECT_EQ(kMeid, capability_->meid());
-  EXPECT_EQ(kEsn, capability_->esn());
+  EXPECT_EQ(kMeid, cellular_->meid());
+  EXPECT_EQ(kEsn, cellular_->esn());
 }
 
 TEST_F(CellularCapabilityUniversalCDMAMainTest, OnCDMARegistrationChanged) {
@@ -375,9 +375,9 @@
   test_olp.SetMethod("POST");
   test_olp.SetPostData("esn=${esn}&mdn=${mdn}&meid=${meid}");
 
-  capability_->esn_ = "0";
-  capability_->mdn_ = "10123456789";
-  capability_->meid_= "4";
+  cellular_->set_esn("0");
+  cellular_->set_mdn("10123456789");
+  cellular_->set_meid("4");
   capability_->sid_ = 1;
 
   string sid_string = base::StringPrintf("%u", capability_->sid_);