commit c9673063722702e0679e54eb06180bb1e623e1e5
author Arman Uguray <armansito@chromium.org> Mon May 13 21:21:53 2013 -0700
committer ChromeBot <chrome-bot@google.com> Wed May 15 14:01:41 2013 -0700
tree 8b7fc6551c9fdff440de79418a499589730e19bc
parent 5127b202379c7379c32de868f0877ec5e96e8b8e

cellular: Setup connect properties correctly for CDMA.

Implemented CellularCapabilityUniversalCDMA::SetupConnectProperties.

BUG=chromium:240596
TEST=Build and run unit tests.

Change-Id: Id9d974c29f73dff66fa5355d3c572bf467d12fe6
Reviewed-on: https://gerrit.chromium.org/gerrit/51088
Commit-Queue: Arman Uguray <armansito@chromium.org>
Reviewed-by: Arman Uguray <armansito@chromium.org>
Tested-by: Arman Uguray <armansito@chromium.org>

cellular_capability_universal_cdma.cc

diff --git a/cellular_capability_universal_cdma.cc b/cellular_capability_universal_cdma.cc
index 8fb4d2f..67d76d6 100644
--- a/cellular_capability_universal_cdma.cc
+++ b/cellular_capability_universal_cdma.cc
@@ -29,6 +29,9 @@
 
 namespace {
 
+const char kPhoneNumber[] = "#777";
+const char kPropertyConnectNumber[] = "number";
+
 string FormattedSID(const string &sid) {
   return "[SID=" + sid + "]";
 }
@@ -438,6 +441,12 @@
   cdma_evdo_registration_state_ = MM_MODEM_CDMA_REGISTRATION_STATE_UNKNOWN;
 }
 
+void CellularCapabilityUniversalCDMA::SetupConnectProperties(
+    DBusPropertiesMap *properties) {
+  (*properties)[kPropertyConnectNumber].writer().append_string(
+      kPhoneNumber);
+}
+
 void CellularCapabilityUniversalCDMA::RequirePIN(
     const string &pin, bool require,
     Error *error, const ResultCallback &callback) {

cellular_capability_universal_cdma.h

diff --git a/cellular_capability_universal_cdma.h b/cellular_capability_universal_cdma.h
index a3d4e95..0e30e9e 100644
--- a/cellular_capability_universal_cdma.h
+++ b/cellular_capability_universal_cdma.h
@@ -44,6 +44,7 @@
       const std::vector<std::string> &invalidated_properties);
   virtual void OnServiceCreated();
   virtual void SetUnregistered(bool searching);
+  virtual void SetupConnectProperties(DBusPropertiesMap *properties);
 
   // TODO(armansito): Remove once 3GPP is implemented in its own class
   virtual void Register(const ResultCallback &callback);

cellular_capability_universal_cdma_unittest.cc

diff --git a/cellular_capability_universal_cdma_unittest.cc b/cellular_capability_universal_cdma_unittest.cc
index d26ad36..ec6622f 100644
--- a/cellular_capability_universal_cdma_unittest.cc
+++ b/cellular_capability_universal_cdma_unittest.cc
@@ -506,6 +506,13 @@
   EXPECT_FALSE(capability_->IsActivating());
 }
 
+TEST_F(CellularCapabilityUniversalCDMAMainTest, SetupConnectProperties) {
+  DBusPropertiesMap map;
+  capability_->SetupConnectProperties(&map);
+  EXPECT_EQ(1, map.size());
+  EXPECT_STREQ("#777", map["number"].reader().get_string());
+}
+
 TEST_F(CellularCapabilityUniversalCDMADispatcherTest,
        UpdatePendingActivationState) {
   capability_->activation_state_ = MM_MODEM_CDMA_ACTIVATION_STATE_ACTIVATED;