commit ae0c64ea644748f28b7a320e9663f30cd69e344e
author Darin Petkov <petkov@chromium.org> Tue Nov 15 15:50:27 2011 +0100
committer Gerrit <chrome-bot@google.com> Thu Nov 17 09:25:43 2011 -0800
tree ffce3bee66b9fc7acfcdc59a56081629cbec5f09
parent f770945ec8c2cb606e922be4e91a1f6a4b454fc6

shill: Move GSM/CDMA structs to capability delegates.

BUG=chromium-os:18735
TEST=unit tests

Change-Id: I3b1e1935465ac728d204fbad411ef6abf85b02f6
Reviewed-on: https://gerrit.chromium.org/gerrit/11764
Tested-by: Darin Petkov <petkov@chromium.org>
Reviewed-by: Jason Glasgow <jglasgow@chromium.org>
Commit-Ready: Darin Petkov <petkov@chromium.org>

cellular_capability_gsm_unittest.cc

diff --git a/cellular_capability_gsm_unittest.cc b/cellular_capability_gsm_unittest.cc
index 5b45480..64e0897 100644
--- a/cellular_capability_gsm_unittest.cc
+++ b/cellular_capability_gsm_unittest.cc
@@ -63,7 +63,7 @@
   }
 
   void SetAccessTechnology(uint32 technology) {
-    cellular_->gsm_.access_technology = technology;
+    capability_.access_technology_ = technology;
   }
 
   void SetRegistrationState(uint32 state) {
@@ -108,12 +108,12 @@
   capability_.GetIdentifiers();
   EXPECT_EQ(kIMEI, cellular_->imei());
   EXPECT_EQ(kIMSI, cellular_->imsi());
-  EXPECT_EQ(kTestCarrier, cellular_->spn());
+  EXPECT_EQ(kTestCarrier, capability_.spn());
   EXPECT_EQ(kMSISDN, cellular_->mdn());
   capability_.GetIdentifiers();
   EXPECT_EQ(kIMEI, cellular_->imei());
   EXPECT_EQ(kIMSI, cellular_->imsi());
-  EXPECT_EQ(kTestCarrier, cellular_->spn());
+  EXPECT_EQ(kTestCarrier, capability_.spn());
   EXPECT_EQ(kMSISDN, cellular_->mdn());
 }
 
@@ -226,6 +226,28 @@
   EXPECT_EQ("T-Mobile", parsed[flimflam::kLongNameProperty]);
 }
 
+TEST_F(CellularCapabilityGSMTest, SetAccessTechnology) {
+  capability_.SetAccessTechnology(MM_MODEM_GSM_ACCESS_TECH_GSM);
+  EXPECT_EQ(MM_MODEM_GSM_ACCESS_TECH_GSM, capability_.access_technology_);
+  SetService();
+  capability_.registration_state_ = MM_MODEM_GSM_NETWORK_REG_STATUS_HOME;
+  capability_.SetAccessTechnology(MM_MODEM_GSM_ACCESS_TECH_GPRS);
+  EXPECT_EQ(MM_MODEM_GSM_ACCESS_TECH_GPRS, capability_.access_technology_);
+  EXPECT_EQ(flimflam::kNetworkTechnologyGprs,
+            cellular_->service()->network_tech());
+}
+
+TEST_F(CellularCapabilityGSMTest, UpdateOperatorInfo) {
+  static const char kOperatorName[] = "Swisscom";
+  InitProviderDB();
+  capability_.network_id_ = "22801";
+  SetService();
+  capability_.UpdateOperatorInfo();
+  EXPECT_EQ(kOperatorName, capability_.operator_name_);
+  EXPECT_EQ("ch", capability_.operator_country_);
+  EXPECT_EQ(kOperatorName, cellular_->service()->serving_operator().GetName());
+}
+
 TEST_F(CellularCapabilityGSMTest, GetNetworkTechnologyString) {
   EXPECT_EQ("", capability_.GetNetworkTechnologyString());
   SetAccessTechnology(MM_MODEM_GSM_ACCESS_TECH_GSM);