commit c08653143f7ff3f9f8c2d978da3814290bce5064
author Darin Petkov <petkov@chromium.org> Fri Sep 16 15:31:20 2011 -0700
committer Darin Petkov <petkov@chromium.org> Wed Sep 21 00:06:07 2011 -0700
tree 7a437f402c6da35e56af2324b36343763acec87c
parent 5c4dd0b0886fb10deae0d3b40628fb2c521aff99

shill: Support for GSM network scanning.

This is mostly placeholder code since synchronous calls will cause crashes due
to timeouts.

BUG=chromium-os:19805
TEST=unit tests

Change-Id: I7ad07d6274b19b39d7955ee256c6928c9f1ce5a1
Reviewed-on: http://gerrit.chromium.org/gerrit/7895
Commit-Ready: Darin Petkov <petkov@chromium.org>
Reviewed-by: Darin Petkov <petkov@chromium.org>
Tested-by: Darin Petkov <petkov@chromium.org>

cellular_unittest.cc

diff --git a/cellular_unittest.cc b/cellular_unittest.cc
index d43c2fd..1e9f63a 100644
--- a/cellular_unittest.cc
+++ b/cellular_unittest.cc
@@ -28,6 +28,7 @@
 #include "shill/proxy_factory.h"
 #include "shill/shill_event.h"
 
+using std::map;
 using std::string;
 using testing::_;
 using testing::NiceMock;
@@ -794,6 +795,48 @@
   dispatcher_.DispatchPendingEvents();
 }
 
+TEST_F(CellularTest, Scan) {
+  static const char kID0[] = "123";
+  static const char kID1[] = "456";
+  Error error;
+  device_->type_ = Cellular::kTypeGSM;
+  device_->Scan(&error);
+  EXPECT_TRUE(error.IsSuccess());
+  ModemGSMNetworkProxyInterface::ScanResults results;
+  results.push_back(ModemGSMNetworkProxyInterface::ScanResult());
+  results[0][Cellular::kNetworkPropertyID] = kID0;
+  results.push_back(ModemGSMNetworkProxyInterface::ScanResult());
+  results[1][Cellular::kNetworkPropertyID] = kID1;
+  EXPECT_CALL(*gsm_network_proxy_, Scan()).WillOnce(Return(results));
+  device_->gsm_network_proxy_.reset(gsm_network_proxy_.release());
+  device_->found_networks_.resize(2, Stringmap());
+  dispatcher_.DispatchPendingEvents();
+  EXPECT_EQ(2, device_->found_networks_.size());
+  EXPECT_EQ(kID0, device_->found_networks_[0][flimflam::kNetworkIdProperty]);
+  EXPECT_EQ(kID1, device_->found_networks_[1][flimflam::kNetworkIdProperty]);
+}
+
+TEST_F(CellularTest, ParseScanResult) {
+  static const char kID[] = "123";
+  static const char kLongName[] = "long name";
+  static const char kShortName[] = "short name";
+  ModemGSMNetworkProxyInterface::ScanResult result;
+  result[Cellular::kNetworkPropertyStatus] = "1";
+  result[Cellular::kNetworkPropertyID] = kID;
+  result[Cellular::kNetworkPropertyLongName] = kLongName;
+  result[Cellular::kNetworkPropertyShortName] = kShortName;
+  result[Cellular::kNetworkPropertyAccessTechnology] = "3";
+  result["unknown property"] = "random value";
+  Stringmap parsed = device_->ParseScanResult(result);
+  EXPECT_EQ(5, parsed.size());
+  EXPECT_EQ("available", parsed[flimflam::kStatusProperty]);
+  EXPECT_EQ(kID, parsed[flimflam::kNetworkIdProperty]);
+  EXPECT_EQ(kLongName, parsed[flimflam::kLongNameProperty]);
+  EXPECT_EQ(kShortName, parsed[flimflam::kShortNameProperty]);
+  EXPECT_EQ(flimflam::kNetworkTechnologyEdge,
+            parsed[flimflam::kTechnologyProperty]);
+}
+
 TEST_F(CellularTest, Activate) {
   Error error;
   device_->type_ = Cellular::kTypeCDMA;