commit beb1c5bef5530a76ad2ae421d8115e54386855d5
author Anton Muhin <antonm@google.com> Thu Oct 16 18:59:57 2014 +0400
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Oct 17 01:13:05 2014 +0000
tree 53c0eb8b1dbac10aa735fe1ada4d0d865d9ab92e
parent 193e1f09538eda502c7a62256cbabca5fc227c44

buffet: Merge registration start and finalization.

As currently user-initiated registration flow is recommended,
it allows us to simplify registration protocol to a single method.

BUG=None
TEST=cros_workon_make buffet --test && manual testing.

Change-Id: I1937b91f4f7b34585ce5b8cb1a4c26ec3a849865
Reviewed-on: https://chromium-review.googlesource.com/223700
Commit-Queue: Anton Muhin <antonm@chromium.org>
Tested-by: Anton Muhin <antonm@chromium.org>
Reviewed-by: Anton Muhin <antonm@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 e33630f..097039a 100644
--- a/buffet/device_registration_info_unittest.cc
+++ b/buffet/device_registration_info_unittest.cc
@@ -270,7 +270,7 @@
   EXPECT_EQ(test_data::kDeviceId, id);
 }
 
-TEST_F(DeviceRegistrationInfoTest, StartRegistration) {
+TEST_F(DeviceRegistrationInfoTest, RegisterDevice) {
   EXPECT_TRUE(dev_reg_->Load());
 
   auto update_ticket = [](const ServerRequest& request,
@@ -339,24 +339,6 @@
       std::string("registrationTickets/") + test_data::kClaimTicketId),
       chromeos::http::request_type::kPatch,
       base::Bind(update_ticket));
-  std::map<std::string, std::string> params;
-  params["ticket_id"] = test_data::kClaimTicketId;
-  std::string json_resp = dev_reg_->StartRegistration(params, nullptr);
-  auto json = std::unique_ptr<base::Value>(base::JSONReader::Read(json_resp));
-  EXPECT_NE(nullptr, json.get());
-  base::DictionaryValue* dict = nullptr;
-  EXPECT_TRUE(json->GetAsDictionary(&dict));
-  std::string value;
-  EXPECT_TRUE(dict->GetString("ticket_id", &value));
-  EXPECT_EQ(test_data::kClaimTicketId, value);
-}
-
-TEST_F(DeviceRegistrationInfoTest, FinishRegistration_NoAuth) {
-  // Test finalizing ticket with no user authorization token.
-  // This assumes that a client would patch in their email separately.
-  EXPECT_TRUE(dev_reg_->Load());
-
-  // General ticket finalization handler.
   std::string ticket_url =
       dev_reg_->GetServiceURL("registrationTickets/" +
                              std::string(test_data::kClaimTicketId));
@@ -367,13 +349,17 @@
   transport_->AddHandler(dev_reg_->GetOAuthURL("token"),
                          chromeos::http::request_type::kPost,
                          base::Bind(OAuth2Handler));
-
   storage_->reset_save_count();
   DeviceRegistrationInfo::TestHelper::SetTestTicketId(dev_reg_.get());
-  EXPECT_TRUE(dev_reg_->FinishRegistration(nullptr));
+
+  std::map<std::string, std::string> params;
+  params["ticket_id"] = test_data::kClaimTicketId;
+  std::string device_id = dev_reg_->RegisterDevice(params, nullptr);
+
+  EXPECT_EQ(test_data::kDeviceId, device_id);
   EXPECT_EQ(1,
             storage_->save_count());  // The device info must have been saved.
-  EXPECT_EQ(2, transport_->GetRequestCount());
+  EXPECT_EQ(3, transport_->GetRequestCount());
 
   // Validate the device info saved to storage...
   auto storage_data = storage_->Load();