commit 00917ceafbc28599391bfcdd5837faf6d63fec32
author mukesh agrawal <quiche@chromium.org> Tue Nov 22 23:56:55 2011 +0000
committer mukesh agrawal <quiche@chromium.org> Wed Nov 23 14:32:25 2011 -0800
tree 345e57fd7fe7074bb5ba0c8d5b1409e9de1f0c38
parent b72cf40dc315f9ae3537980f4fd85e737c125a03

shill: set favorite property when a Service is connected, and
set autoconnect property when a Service is made a favorite

BUG=chromium-os:23346,chromium-os:23349
TEST=new unittests

Bonus changes:
- remove some unused variables in ManagerTest.SortServices
- add "static" comment for Service::DecideBetween and
  Service::Compare

Change-Id: I4b7e01f98d1292b9c8f951c9a54a01f76292b740
Reviewed-on: https://gerrit.chromium.org/gerrit/12053
Reviewed-by: mukesh agrawal <quiche@chromium.org>
Tested-by: mukesh agrawal <quiche@chromium.org>

manager_unittest.cc

diff --git a/manager_unittest.cc b/manager_unittest.cc
index 82bae32..bf440cb 100644
--- a/manager_unittest.cc
+++ b/manager_unittest.cc
@@ -279,7 +279,6 @@
     ServiceRefPtr service1(new ServiceUnderTest(control_interface(),
                                                 dispatcher(),
                                                 &manager));
-    service1->set_favorite(!service1->favorite());
     ASSERT_TRUE(profile->AdoptService(service1));
     ASSERT_TRUE(profile->ContainsService(service1));
   }  // Force destruction of service1.
@@ -308,7 +307,6 @@
     ServiceRefPtr service1(new ServiceUnderTest(control_interface(),
                                                 dispatcher(),
                                                 &manager));
-    service1->set_favorite(!service1->favorite());
     ASSERT_TRUE(profile->AdoptService(service1));
     ASSERT_TRUE(profile->ContainsService(service1));
   }  // Force destruction of service1.
@@ -648,6 +646,10 @@
 }
 
 TEST_F(ManagerTest, SortServices) {
+  // TODO(quiche): Some of these tests would probably fit better in
+  // service_unittest, since the actual comparison of Services is
+  // implemented in Service. (crosbug.com/23370)
+
   scoped_refptr<MockService> mock_service0(
       new NiceMock<MockService>(control_interface(),
                                 dispatcher(),
@@ -656,8 +658,6 @@
       new NiceMock<MockService>(control_interface(),
                                 dispatcher(),
                                 manager()));
-  string service1_name(mock_service0->UniqueName());
-  string service2_name(mock_service1->UniqueName());
 
   manager()->RegisterService(mock_service0);
   manager()->RegisterService(mock_service1);
@@ -708,7 +708,7 @@
   EXPECT_TRUE(ServiceOrderIs(mock_service0, mock_service1));
 
   // Favorite
-  mock_service1->set_favorite(true);
+  mock_service1->MakeFavorite();
   manager()->UpdateService(mock_service1);
   EXPECT_TRUE(ServiceOrderIs(mock_service1, mock_service0));
 
@@ -738,4 +738,23 @@
   manager()->Stop();
 }
 
+TEST_F(ManagerTest, UpdateServiceConnected) {
+  scoped_refptr<MockService> mock_service(
+      new NiceMock<MockService>(control_interface(),
+                                dispatcher(),
+                                manager()));
+  manager()->RegisterService(mock_service);
+  EXPECT_FALSE(mock_service->favorite());
+  EXPECT_FALSE(mock_service->auto_connect());
+
+  EXPECT_CALL(*mock_service.get(), state())
+      .WillRepeatedly(Return(Service::kStateConnected));
+  manager()->UpdateService(mock_service);
+  // We can't EXPECT_CALL(..., MakeFavorite), because that requires us
+  // to mock out MakeFavorite. And mocking that out would break the
+  // SortServices test. (crosbug.com/23370)
+  EXPECT_TRUE(mock_service->favorite());
+  EXPECT_TRUE(mock_service->auto_connect());
+}
+
 }  // namespace shill