commit 3239932e4a0a92fec52d88860081cbbb003eabb0
author mukesh agrawal <quiche@chromium.org> Thu Sep 01 10:53:43 2011 -0700
committer mukesh agrawal <quiche@chromium.org> Thu Sep 08 14:48:23 2011 -0700
tree d275c2cdf425ee940df8393dcc29aa4e83ee40b1
parent f1f490ce9d3aef0309244f63682a651efa37f1d3

shill: implement manager.RequestScan (for WiFi only)

BUG=chromium-os:19831
TEST=unittests, WiFiManager/000_SSID_Length_Limit

note that 000_SSID_Length_Limit does not pass yet,
because we don't do IP configuration yet. but it
does get scan results.

Change-Id: I8993b3c646eda705271d1f7ad7d7341c692ae06b
Reviewed-on: http://gerrit.chromium.org/gerrit/7407
Reviewed-by: mukesh agrawal <quiche@chromium.org>
Tested-by: mukesh agrawal <quiche@chromium.org>

wifi_unittest.cc

diff --git a/wifi_unittest.cc b/wifi_unittest.cc
index 0d71cbb..2d5cd9f 100644
--- a/wifi_unittest.cc
+++ b/wifi_unittest.cc
@@ -27,6 +27,7 @@
 #include "shill/proxy_factory.h"
 #include "shill/wifi_endpoint.h"
 #include "shill/wifi.h"
+#include "shill/wifi_service.h"
 
 using std::map;
 using std::string;
@@ -97,7 +98,7 @@
   WiFiMainTest()
       : manager_(&control_interface_, NULL, NULL),
         wifi_(new WiFi(&control_interface_,
-                       NULL,
+                       &dispatcher_,
                        &manager_,
                        kDeviceName,
                        kDeviceAddress,
@@ -152,7 +153,7 @@
   SupplicantInterfaceProxyInterface *GetSupplicantInterfaceProxy() {
     return wifi_->supplicant_interface_proxy_.get();
   }
-  void InitiateConnect(const WiFiService &service) {
+  void InitiateConnect(WiFiService *service) {
     wifi_->ConnectTo(service);
   }
   void ReportBSS(const ::DBus::Path &bss_path,
@@ -169,6 +170,14 @@
   void StopWiFi() {
     wifi_->Stop();
   }
+  MockManager *manager() {
+    return &manager_;
+  }
+  const WiFiConstRefPtr wifi() const {
+    return wifi_;
+  }
+
+  EventDispatcher dispatcher_;
 
  private:
   NiceMockControl control_interface_;
@@ -239,6 +248,7 @@
               "test threw fi.w1.wpa_supplicant1.InterfaceUnknown")));
   EXPECT_CALL(*supplicant_interface_proxy_, Scan(_));
   StartWiFi();
+  dispatcher_.DispatchPendingEvents();
 }
 
 TEST_F(WiFiMainTest, Restart) {
@@ -251,6 +261,7 @@
   EXPECT_CALL(*supplicant_process_proxy_, GetInterface(_));
   EXPECT_CALL(*supplicant_interface_proxy_, Scan(_));
   StartWiFi();
+  dispatcher_.DispatchPendingEvents();
 }
 
 TEST_F(WiFiMainTest, StartClearsState) {
@@ -295,6 +306,8 @@
       "bss1", "ssid1", "00:00:00:00:00:01", 1, kNetworkModeInfrastructure);
   ReportBSS(
       "bss2", "ssid2", "00:00:00:00:00:02", 2, kNetworkModeInfrastructure);
+  EXPECT_CALL(*manager(), RegisterService(_))
+      .Times(3);
   ReportScanDone();
   EXPECT_EQ(3, GetServiceMap().size());
 }
@@ -310,11 +323,12 @@
   {
     InSequence s;
     DBus::Path fake_path("/fake/path");
+    WiFiService *service(GetServiceMap().begin()->second);
 
     EXPECT_CALL(supplicant_interface_proxy, AddNetwork(_))
         .WillOnce(Return(fake_path));
     EXPECT_CALL(supplicant_interface_proxy, SelectNetwork(fake_path));
-    InitiateConnect(*(GetServiceMap().begin()->second));
+    InitiateConnect(service);
   }
 }