commit baf7a95416a3313843d276b00acb530ec3c5b3c5
author Vitaly Buka <vitalybuka@google.com> Sat Oct 10 01:44:45 2015 -0700
committer Vitaly Buka <vitalybuka@google.com> Sat Oct 10 02:06:11 2015 -0700
tree 6d9a68ed35ed4900b3589de46086ffaeb0cfb9cd
parent be39e9339baa85af546344da40b0663a6aea1a97

Command::Complete should set results instead of progress

Change-Id: I81bc8124ebf41a62b69df58032f38c825a03b817

buffet/dbus_command_proxy.cc

diff --git a/buffet/dbus_command_proxy.cc b/buffet/dbus_command_proxy.cc
index 8c5c99f..327aea3 100644
--- a/buffet/dbus_command_proxy.cc
+++ b/buffet/dbus_command_proxy.cc
@@ -104,8 +104,8 @@
     ConvertError(*weave_error, error);
     return false;
   }
-  dbus_adaptor_.SetProgress(
-      DictionaryToDBusVariantDictionary(*command->GetProgress()));
+  dbus_adaptor_.SetResults(
+      DictionaryToDBusVariantDictionary(*command->GetResults()));
   dbus_adaptor_.SetState(EnumToString(command->GetState()));
   return true;
 }

buffet/dbus_command_proxy.h

diff --git a/buffet/dbus_command_proxy.h b/buffet/dbus_command_proxy.h
index 68f2055..dd9e679 100644
--- a/buffet/dbus_command_proxy.h
+++ b/buffet/dbus_command_proxy.h
@@ -36,17 +36,13 @@
           completion_callback);
 
  private:
-  // Handles calls to com.android.Weave.Command.SetProgress(progress).
   bool SetProgress(chromeos::ErrorPtr* error,
                    const chromeos::VariantDictionary& progress) override;
-  // Handles calls to com.android.Weave.Command.Complete(results).
   bool Complete(chromeos::ErrorPtr* error,
                 const chromeos::VariantDictionary& results) override;
-  // Handles calls to com.android.Weave.Command.Abort().
   bool Abort(chromeos::ErrorPtr* error,
              const std::string& code,
              const std::string& message) override;
-  // Handles calls to com.android.Weave.Command.Cancel().
   bool Cancel(chromeos::ErrorPtr* error) override;
 
   std::weak_ptr<weave::Command> command_;

buffet/dbus_command_proxy_unittest.cc

diff --git a/buffet/dbus_command_proxy_unittest.cc b/buffet/dbus_command_proxy_unittest.cc
index 5988d98..06a393e 100644
--- a/buffet/dbus_command_proxy_unittest.cc
+++ b/buffet/dbus_command_proxy_unittest.cc
@@ -78,7 +78,7 @@
     EXPECT_CALL(*command_, MockGetProgress())
         .WillRepeatedly(ReturnRefOfCopy<std::string>("{}"));
     EXPECT_CALL(*command_, MockGetResults())
-        .WillOnce(ReturnRefOfCopy<std::string>("{}"));
+        .WillRepeatedly(ReturnRefOfCopy<std::string>("{}"));
 
     // Set up a mock ExportedObject to be used with the DBus command proxy.
     std::string cmd_path = buffet::dbus_constants::kCommandServicePathPrefix;