commit 5191e81a2a81aaf57acea001a9c45b5186604bbc
author Anton Muhin <antonm@google.com> Thu Oct 30 17:49:48 2014 +0400
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Nov 07 06:34:01 2014 +0000
tree 0ad36854415e650efafb83d23096699ef48e341b
parent 5c7bf01d22935ebf669aa85a615923ebc420c1a9

buffet: Separate command IDs from DBus paths.

As we're starting to support cloud and local cases, we need proper
support for cloud command IDs.  Therefore now we require each
command instance to have some command id, but generate dbus path
independently.

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

Change-Id: I83ae92872d920c8e0d6e15324ad11feebfd1f540
Reviewed-on: https://chromium-review.googlesource.com/226532
Tested-by: Anton Muhin <antonm@chromium.org>
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Commit-Queue: Anton Muhin <antonm@chromium.org>

buffet/commands/command_queue_unittest.cc

diff --git a/buffet/commands/command_queue_unittest.cc b/buffet/commands/command_queue_unittest.cc
index 36c760e..8fe0c9d 100644
--- a/buffet/commands/command_queue_unittest.cc
+++ b/buffet/commands/command_queue_unittest.cc
@@ -15,9 +15,11 @@
 namespace {
 
 std::unique_ptr<buffet::CommandInstance> CreateDummyCommandInstance(
-    const std::string& name = "base.reboot") {
-  return std::unique_ptr<buffet::CommandInstance>(
+    const std::string& name, const std::string& id) {
+  auto cmd = std::unique_ptr<buffet::CommandInstance>(
       new buffet::CommandInstance(name, "powerd", {}));
+  cmd->SetID(id);
+  return cmd;
 }
 
 // Fake implementation of CommandDispachInterface.
@@ -61,19 +63,19 @@
 
 TEST(CommandQueue, Add) {
   buffet::CommandQueue queue;
-  std::set<std::string> ids;  // Using set<> to check that IDs are unique.
-  ids.insert(queue.Add(CreateDummyCommandInstance()));
-  ids.insert(queue.Add(CreateDummyCommandInstance()));
-  ids.insert(queue.Add(CreateDummyCommandInstance()));
+  queue.Add(CreateDummyCommandInstance("base.reboot", "id1"));
+  queue.Add(CreateDummyCommandInstance("base.reboot", "id2"));
+  queue.Add(CreateDummyCommandInstance("base.reboot", "id3"));
   EXPECT_EQ(3, queue.GetCount());
-  EXPECT_EQ(3, ids.size());
   EXPECT_FALSE(queue.IsEmpty());
 }
 
 TEST(CommandQueue, Remove) {
   buffet::CommandQueue queue;
-  std::string id1 = queue.Add(CreateDummyCommandInstance());
-  std::string id2 = queue.Add(CreateDummyCommandInstance());
+  const std::string id1 = "id1";
+  const std::string id2 = "id2";
+  queue.Add(CreateDummyCommandInstance("base.reboot", id1));
+  queue.Add(CreateDummyCommandInstance("base.reboot", id2));
   EXPECT_FALSE(queue.IsEmpty());
   EXPECT_EQ(nullptr, queue.Remove("dummy").get());
   EXPECT_EQ(2, queue.GetCount());
@@ -92,8 +94,10 @@
   FakeDispatchInterface dispatch;
   buffet::CommandQueue queue;
   queue.SetCommandDispachInterface(&dispatch);
-  std::string id1 = queue.Add(CreateDummyCommandInstance());
-  std::string id2 = queue.Add(CreateDummyCommandInstance());
+  const std::string id1 = "id1";
+  const std::string id2 = "id2";
+  queue.Add(CreateDummyCommandInstance("base.reboot", id1));
+  queue.Add(CreateDummyCommandInstance("base.reboot", id2));
   std::set<std::string> ids{id1, id2};  // Make sure they are sorted properly.
   std::string expected_set = chromeos::string_utils::Join(
       ',', std::vector<std::string>(ids.begin(), ids.end()));
@@ -106,8 +110,10 @@
 
 TEST(CommandQueue, Find) {
   buffet::CommandQueue queue;
-  std::string id1 = queue.Add(CreateDummyCommandInstance("base.reboot"));
-  std::string id2 = queue.Add(CreateDummyCommandInstance("base.shutdown"));
+  const std::string id1 = "id1";
+  const std::string id2 = "id2";
+  queue.Add(CreateDummyCommandInstance("base.reboot", id1));
+  queue.Add(CreateDummyCommandInstance("base.shutdown", id2));
   EXPECT_EQ(nullptr, queue.Find("dummy"));
   auto cmd1 = queue.Find(id1);
   EXPECT_NE(nullptr, cmd1);