commit 07193fdb601f4cea6301ebb85ebf20596807e126
author Ben Chan <benchan@chromium.org> Fri Jul 12 22:10:55 2013 -0700
committer ChromeBot <chrome-bot@google.com> Mon Jul 15 18:09:09 2013 -0700
tree 451d433201fa753614515644a85c81610baf6c61
parent 0381f9a7b4c0d27387bae44ea2f3b048fad1830c

shill: cellular: Pass operator-specific MDN to online payment portal.

BUG=chrome-os-partner:20887
TEST=Tested the following:
1. Build and run unit tests.
2. Run `connectivity show services` to verify that the 'Cellular.OlpUrl'
   property of a LTE cellular service includes a 10-digit MDN.
3. Verify that clicking the 'View account' button on the settings page
   of a connected LTE service launches the online account page of the
   mobile carrier.

Change-Id: If7a9660082b3b33812d3f1a0c0f99e01c17265f6
Reviewed-on: https://gerrit.chromium.org/gerrit/61823
Reviewed-by: Arman Uguray <armansito@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>
Tested-by: 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 e9e707f..371b09b 100644
--- a/cellular_capability_universal_cdma_unittest.cc
+++ b/cellular_capability_universal_cdma_unittest.cc
@@ -349,26 +349,40 @@
 }
 
 TEST_F(CellularCapabilityUniversalCDMAMainTest, UpdateOLP) {
+  CellularOperatorInfo::CellularOperator cellular_operator;
   CellularService::OLP test_olp;
   test_olp.SetURL("http://testurl");
   test_olp.SetMethod("POST");
   test_olp.SetPostData("esn=${esn}&mdn=${mdn}&meid=${meid}");
 
   capability_->esn_ = "0";
-  capability_->mdn_ = "3";
+  capability_->mdn_ = "10123456789";
   capability_->meid_= "4";
   capability_->sid_ = 1;
 
+  string sid_string = base::StringPrintf("%u", capability_->sid_);
   EXPECT_CALL(*modem_info_.mock_cellular_operator_info(),
-      GetOLPBySID(base::StringPrintf("%u", capability_->sid_)))
+              GetCellularOperatorBySID(sid_string))
+      .WillRepeatedly(Return(&cellular_operator));
+  EXPECT_CALL(*modem_info_.mock_cellular_operator_info(),
+              GetOLPBySID(sid_string))
       .WillRepeatedly(Return(&test_olp));
 
   SetService();
+
+  cellular_operator.identifier_ = "vzw";
+  capability_->UpdateOLP();
+  const CellularService::OLP &vzw_olp = cellular_->service()->olp();
+  EXPECT_EQ("http://testurl", vzw_olp.GetURL());
+  EXPECT_EQ("POST", vzw_olp.GetMethod());
+  EXPECT_EQ("esn=0&mdn=0123456789&meid=4", vzw_olp.GetPostData());
+
+  cellular_operator.identifier_ = "foo";
   capability_->UpdateOLP();
   const CellularService::OLP &olp = cellular_->service()->olp();
   EXPECT_EQ("http://testurl", olp.GetURL());
   EXPECT_EQ("POST", olp.GetMethod());
-  EXPECT_EQ("esn=0&mdn=3&meid=4", olp.GetPostData());
+  EXPECT_EQ("esn=0&mdn=10123456789&meid=4", olp.GetPostData());
 }
 
 TEST_F(CellularCapabilityUniversalCDMAMainTest, ActivateAutomatic) {