commit bf14e94cbd47d6320eec846f1ca4def026840e14
author mukesh agrawal <quiche@chromium.org> Fri Mar 02 14:36:34 2012 -0800
committer Gerrit <chrome-bot@google.com> Mon Mar 12 12:53:26 2012 -0700
tree 80f8b4abffddcbba7c4bd37f62f76ecca856607f
parent 02867717f4e1e72ae3ed337ed854736c7b00130e

shill: logging improvements

BUG=None
TEST=unit tests

Change-Id: I0b91fc7c2b44a0866d0bb53d546a7a87bb7ccccd
Reviewed-on: https://gerrit.chromium.org/gerrit/17743
Commit-Ready: mukesh agrawal <quiche@chromium.org>
Reviewed-by: mukesh agrawal <quiche@chromium.org>
Tested-by: mukesh agrawal <quiche@chromium.org>

service_unittest.cc

diff --git a/service_unittest.cc b/service_unittest.cc
index bb43eaa..6e98166 100644
--- a/service_unittest.cc
+++ b/service_unittest.cc
@@ -299,36 +299,40 @@
 }
 
 TEST_F(ServiceTest, IsAutoConnectable) {
+  const char *reason;
   service_->set_connectable(true);
-  EXPECT_TRUE(service_->IsAutoConnectable());
+  EXPECT_TRUE(service_->IsAutoConnectable(&reason));
 
   // We should not auto-connect to a Service that a user has
   // deliberately disconnected.
   Error error;
   service_->Disconnect(&error);
-  EXPECT_FALSE(service_->IsAutoConnectable());
+  EXPECT_FALSE(service_->IsAutoConnectable(&reason));
+  EXPECT_STREQ(Service::kAutoConnExplicitDisconnect, reason);
 
   // But if the Service is reloaded, it is eligible for auto-connect
   // again.
   NiceMock<MockStore> storage;
   EXPECT_CALL(storage, ContainsGroup(storage_id_)).WillOnce(Return(true));
   EXPECT_TRUE(service_->Load(&storage));
-  EXPECT_TRUE(service_->IsAutoConnectable());
+  EXPECT_TRUE(service_->IsAutoConnectable(&reason));
 
   // A deliberate Connect should also re-enable auto-connect.
   service_->Disconnect(&error);
-  EXPECT_FALSE(service_->IsAutoConnectable());
+  EXPECT_FALSE(service_->IsAutoConnectable(&reason));
   service_->Connect(&error);
-  EXPECT_TRUE(service_->IsAutoConnectable());
+  EXPECT_TRUE(service_->IsAutoConnectable(&reason));
 
   // TODO(quiche): After we have resume handling in place, test that
   // we re-enable auto-connect on resume. crosbug.com/25213
 
   service_->SetState(Service::kStateConnected);
-  EXPECT_FALSE(service_->IsAutoConnectable());
+  EXPECT_FALSE(service_->IsAutoConnectable(&reason));
+  EXPECT_STREQ(Service::kAutoConnConnected, reason);
 
   service_->SetState(Service::kStateAssociating);
-  EXPECT_FALSE(service_->IsAutoConnectable());
+  EXPECT_FALSE(service_->IsAutoConnectable(&reason));
+  EXPECT_STREQ(Service::kAutoConnConnecting, reason);
 }
 
 // Make sure a property is registered as a write only property