commit b055f154cbbc49a437997a0d1051303c9f99d7e5
author Vitaly Buka <vitalybuka@chromium.org> Thu Mar 12 13:41:43 2015 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Thu Mar 19 00:47:07 2015 +0000
tree 24fe662137971876c8f253783a1fc7f83d0e813f
parent ed45acdf2fb66bae81bf89cc76d19693317ad546

buffet: Update RegistrationStatus enum and how it's set

Motivation is to simplify states and make them more consistent with Privet
state.

Also update buffet code that switches states to better match cloud connection
state.

CQ-DEPEND=CL:260680
BUG=brillo:572,brillo:571,brillo:592
TEST=manual, register device, restart buffet and privetd, reboot router
     checking if gcd.status of privet/info is correct.

Change-Id: I74c36d57a2396660417bf6db8166f90263d6636d
Reviewed-on: https://chromium-review.googlesource.com/260302
Tested-by: Vitaly Buka <vitalybuka@chromium.org>
Reviewed-by: Christopher Wiley <wiley@chromium.org>
Commit-Queue: Vitaly Buka <vitalybuka@chromium.org>

buffet/device_registration_info_unittest.cc

diff --git a/buffet/device_registration_info_unittest.cc b/buffet/device_registration_info_unittest.cc
index 2912fb6..7909713 100644
--- a/buffet/device_registration_info_unittest.cc
+++ b/buffet/device_registration_info_unittest.cc
@@ -319,8 +319,7 @@
   SetDefaultDeviceRegistration(&data_);
   storage_->Save(&data_);
   EXPECT_TRUE(dev_reg_->Load());
-  EXPECT_EQ(RegistrationStatus::kOffline,
-            dev_reg_->GetRegistrationStatus());
+  EXPECT_EQ(RegistrationStatus::kConnecting, dev_reg_->GetRegistrationStatus());
 
   transport_->AddHandler(dev_reg_->GetOAuthURL("token"),
                          chromeos::http::request_type::kPost,
@@ -331,16 +330,14 @@
   EXPECT_EQ(1, transport_->GetRequestCount());
   EXPECT_TRUE(error->HasError(buffet::kErrorDomainOAuth2,
                               "unable_to_authenticate"));
-  EXPECT_EQ(RegistrationStatus::kOffline,
-            dev_reg_->GetRegistrationStatus());
+  EXPECT_EQ(RegistrationStatus::kConnecting, dev_reg_->GetRegistrationStatus());
 }
 
 TEST_F(DeviceRegistrationInfoTest, CheckDeregistration) {
   SetDefaultDeviceRegistration(&data_);
   storage_->Save(&data_);
   EXPECT_TRUE(dev_reg_->Load());
-  EXPECT_EQ(RegistrationStatus::kOffline,
-            dev_reg_->GetRegistrationStatus());
+  EXPECT_EQ(RegistrationStatus::kConnecting, dev_reg_->GetRegistrationStatus());
 
   transport_->AddHandler(dev_reg_->GetOAuthURL("token"),
                          chromeos::http::request_type::kPost,
@@ -493,7 +490,7 @@
   EXPECT_EQ(1,
             storage_->save_count());  // The device info must have been saved.
   EXPECT_EQ(3, transport_->GetRequestCount());
-  EXPECT_EQ(RegistrationStatus::kRegistered, dev_reg_->GetRegistrationStatus());
+  EXPECT_EQ(RegistrationStatus::kConnecting, dev_reg_->GetRegistrationStatus());
 
   // Validate the device info saved to storage...
   auto storage_data = storage_->Load();
@@ -522,13 +519,13 @@
   // After we've been initialized, we should be either offline or unregistered,
   // depending on whether or not we've found credentials.
   EXPECT_TRUE(dev_reg_->Load());
-  EXPECT_EQ(RegistrationStatus::kUnregistered,
+  EXPECT_EQ(RegistrationStatus::kUnconfigured,
             dev_reg_->GetRegistrationStatus());
   // Put some credentials into our state, make sure we call that offline.
   SetDefaultDeviceRegistration(&data_);
   storage_->Save(&data_);
   EXPECT_TRUE(dev_reg_->Load());
-  EXPECT_EQ(RegistrationStatus::kOffline, dev_reg_->GetRegistrationStatus());
+  EXPECT_EQ(RegistrationStatus::kConnecting, dev_reg_->GetRegistrationStatus());
 }
 
 }  // namespace buffet