commit 808e2d8faa156bb0c81fed2a2611ef2c2cdea107
author Alex Vakulenko <avakulenko@chromium.org> Wed Apr 08 15:45:56 2015 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Thu Apr 09 22:34:08 2015 +0000
tree 1404759686aaad4dc72a76b1d56e8bd6d078b23b
parent 468f7f3cba125e69ae29a44b55b1f3008a4aa215

buffet: Fix command progress update JSON for GCD server

GCD server expects command progress updates to contain a device-specific
JSON object, while buffet was providing just an integer. Make GCD server
happy by creating an object instead by sticking another "progress" property
as in {"progress":{"progress":100}}.

Also added some unit tests to cover the rest of UpdateCommand notifications.

BUG=brillo:779
TEST=`FEATURES=test emerge-link libchromeos buffet`

Change-Id: I210de62abae7fa1c357449b0c07b5298e8606ec0
Reviewed-on: https://chromium-review.googlesource.com/264867
Reviewed-by: Vitaly Buka <vitalybuka@chromium.org>
Trybot-Ready: Alex Vakulenko <avakulenko@chromium.org>
Tested-by: Alex Vakulenko <avakulenko@chromium.org>
Commit-Queue: Alex Vakulenko <avakulenko@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 e3fb737..c800052 100644
--- a/buffet/device_registration_info_unittest.cc
+++ b/buffet/device_registration_info_unittest.cc
@@ -521,6 +521,8 @@
   })");
   EXPECT_TRUE(command_manager_->LoadCommands(*json_cmds, "", nullptr));
 
+  const std::string command_url = dev_reg_->GetServiceURL("commands/1234");
+
   auto commands_json = buffet::unittests::CreateValue(R"([{
     'name':'robot._jump',
     'id':'1234',
@@ -538,22 +540,50 @@
     {"status", string_type.CreateValue(std::string{"Ok"}, nullptr)}
   };
 
-  auto update_command = [](const ServerRequest& request,
-                           ServerResponse* response) {
-    // Make sure we serialize the JSON back without any pretty print so
-    // the string comparison works correctly.
-    auto json = request.GetDataAsJson();
-    EXPECT_NE(nullptr, json.get());
-    std::string value;
-    ASSERT_TRUE(base::JSONWriter::Write(json.get(), &value));
-    EXPECT_EQ(R"({"results":{"status":"Ok"}})", value);
+  // UpdateCommand when setting command results.
+  auto update_command_results = [](const ServerRequest& request,
+                                   ServerResponse* response) {
+    EXPECT_EQ(R"({"results":{"status":"Ok"}})",
+              request.GetDataAsNormalizedJsonString());
   };
 
-  transport_->AddHandler(dev_reg_->GetServiceURL("commands/1234"),
-      chromeos::http::request_type::kPatch,
-      base::Bind(update_command));
+  transport_->AddHandler(command_url,
+                         chromeos::http::request_type::kPatch,
+                         base::Bind(update_command_results));
 
   command->SetResults(results);
+
+  // UpdateCommand when setting command progress.
+  int count = 0;  // This will be called twice...
+  auto update_command_progress = [&count](const ServerRequest& request,
+                                          ServerResponse* response) {
+    if (count++ == 0) {
+      EXPECT_EQ(R"({"state":"inProgress"})",
+                request.GetDataAsNormalizedJsonString());
+    } else {
+      EXPECT_EQ(R"({"progress":{"progress":18}})",
+                request.GetDataAsNormalizedJsonString());
+    }
+  };
+
+  transport_->AddHandler(command_url,
+                         chromeos::http::request_type::kPatch,
+                         base::Bind(update_command_progress));
+
+  command->SetProgress(18);
+
+  // UpdateCommand when changing command status.
+  auto update_command_state = [](const ServerRequest& request,
+                                 ServerResponse* response) {
+    EXPECT_EQ(R"({"state":"cancelled"})",
+              request.GetDataAsNormalizedJsonString());
+  };
+
+  transport_->AddHandler(command_url,
+                         chromeos::http::request_type::kPatch,
+                         base::Bind(update_command_state));
+
+  command->Cancel();
 }