diff options
| author | Vitaly Buka <vitalybuka@google.com> | 2016-03-09 10:44:48 -0800 |
|---|---|---|
| committer | Vitaly Buka <vitalybuka@google.com> | 2016-03-09 19:11:46 +0000 |
| commit | 5ddd991fa692c7a32eb0097017abaa452a1844b4 (patch) | |
| tree | 6a6ab8fe397e05b5a0855c410e65ff0bc9735eb1 | |
| parent | 00180aab7e8bbabf3c8cd8a27ce10e7a9118ccad (diff) | |
| download | libweave-5ddd991fa692c7a32eb0097017abaa452a1844b4.tar.gz | |
Return 'component' in command JSON
BUG: 26730593
Change-Id: I7661511669de35ff0e67d1da06fbd5ff5df510e0
Reviewed-on: https://weave-review.googlesource.com/2887
Reviewed-by: Alex Vakulenko <avakulenko@google.com>
| -rw-r--r-- | src/commands/command_instance.cc | 1 | ||||
| -rw-r--r-- | src/commands/command_instance_unittest.cc | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/commands/command_instance.cc b/src/commands/command_instance.cc index 590bbb1..dfc3fbd 100644 --- a/src/commands/command_instance.cc +++ b/src/commands/command_instance.cc @@ -220,6 +220,7 @@ std::unique_ptr<base::DictionaryValue> CommandInstance::ToJson() const { json->SetString(commands::attributes::kCommand_Id, id_); json->SetString(commands::attributes::kCommand_Name, name_); + json->SetString(commands::attributes::kCommand_Component, component_); json->Set(commands::attributes::kCommand_Parameters, parameters_.DeepCopy()); json->Set(commands::attributes::kCommand_Progress, progress_.DeepCopy()); json->Set(commands::attributes::kCommand_Results, results_.DeepCopy()); diff --git a/src/commands/command_instance_unittest.cc b/src/commands/command_instance_unittest.cc index 803d5b4..e06332f 100644 --- a/src/commands/command_instance_unittest.cc +++ b/src/commands/command_instance_unittest.cc @@ -103,6 +103,7 @@ TEST(CommandInstanceTest, FromJson_ParamsNotObject) { TEST(CommandInstanceTest, ToJson) { auto json = CreateDictionaryValue(R"({ + 'component': 'testComponent', 'name': 'robot.jump', 'parameters': { 'height': 53, @@ -121,6 +122,7 @@ TEST(CommandInstanceTest, ToJson) { nullptr)); json->MergeDictionary(CreateDictionaryValue(R"({ + 'component': 'testComponent', 'id': 'testId', 'progress': {'progress': 15}, 'state': 'done', @@ -135,6 +137,7 @@ TEST(CommandInstanceTest, ToJson) { TEST(CommandInstanceTest, ToJsonError) { auto json = CreateDictionaryValue(R"({ + 'component': 'testComponent', 'name': 'base.reboot', 'parameters': {} })"); @@ -147,6 +150,7 @@ TEST(CommandInstanceTest, ToJsonError) { instance->Abort(error.get(), nullptr); json->MergeDictionary(CreateDictionaryValue(R"({ + 'component': 'testComponent', 'id': 'testId', 'state': 'aborted', 'progress': {}, |