From 012cd9842559fd985d70a59919c382d71f15c5ac Mon Sep 17 00:00:00 2001 From: Vitaly Buka Date: Mon, 22 Feb 2016 17:18:49 -0800 Subject: Move mock_component_manager.h into test/ dir Change-Id: I4c3f95174a7fa83d9fc04fc75a89e4f908bb615a Reviewed-on: https://weave-review.googlesource.com/2707 Reviewed-by: Alex Vakulenko --- src/commands/cloud_command_proxy_unittest.cc | 4 +- src/component_manager_unittest.cc | 4 +- src/mock_component_manager.h | 130 -------------------------- src/test/mock_component_manager.h | 134 +++++++++++++++++++++++++++ 4 files changed, 138 insertions(+), 134 deletions(-) delete mode 100644 src/mock_component_manager.h create mode 100644 src/test/mock_component_manager.h (limited to 'src') diff --git a/src/commands/cloud_command_proxy_unittest.cc b/src/commands/cloud_command_proxy_unittest.cc index 0de67fe..e0bd4fc 100644 --- a/src/commands/cloud_command_proxy_unittest.cc +++ b/src/commands/cloud_command_proxy_unittest.cc @@ -14,7 +14,7 @@ #include #include "src/commands/command_instance.h" -#include "src/mock_component_manager.h" +#include "src/test/mock_component_manager.h" using testing::_; using testing::AnyNumber; @@ -141,7 +141,7 @@ class CloudCommandProxyTest : public ::testing::Test { ComponentManager::UpdateID current_state_update_id_{0}; base::CallbackList callbacks_; testing::StrictMock cloud_updater_; - testing::StrictMock component_manager_; + testing::StrictMock component_manager_; testing::StrictMock task_runner_; std::queue task_queue_; std::unique_ptr command_instance_; diff --git a/src/component_manager_unittest.cc b/src/component_manager_unittest.cc index 97dc00d..c56567c 100644 --- a/src/component_manager_unittest.cc +++ b/src/component_manager_unittest.cc @@ -12,7 +12,7 @@ #include "src/bind_lambda.h" #include "src/commands/schema_constants.h" -#include "src/mock_component_manager.h" +#include "src/test/mock_component_manager.h" #include "src/test/mock_clock.h" namespace weave { @@ -1481,7 +1481,7 @@ TEST_F(ComponentManagerTest, GetLegacyState) { TEST_F(ComponentManagerTest, TestMockComponentManager) { // Check that all the virtual methods are mocked out. - MockComponentManager mock; + test::MockComponentManager mock; } } // namespace weave diff --git a/src/mock_component_manager.h b/src/mock_component_manager.h deleted file mode 100644 index addd6f0..0000000 --- a/src/mock_component_manager.h +++ /dev/null @@ -1,130 +0,0 @@ -// Copyright 2015 The Weave Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef LIBWEAVE_SRC_MOCK_COMPONENT_MANAGER_H_ -#define LIBWEAVE_SRC_MOCK_COMPONENT_MANAGER_H_ - -#include "src/component_manager.h" - -#include - -namespace weave { - -class MockComponentManager : public ComponentManager { - public: - ~MockComponentManager() override {} - MOCK_METHOD2(LoadTraits, - bool(const base::DictionaryValue& dict, ErrorPtr* error)); - MOCK_METHOD2(LoadTraits, bool(const std::string& json, ErrorPtr* error)); - MOCK_METHOD1(AddTraitDefChangedCallback, void(const base::Closure& callback)); - MOCK_METHOD4(AddComponent, - bool(const std::string& path, - const std::string& name, - const std::vector& traits, - ErrorPtr* error)); - MOCK_METHOD4(AddComponentArrayItem, - bool(const std::string& path, - const std::string& name, - const std::vector& traits, - ErrorPtr* error)); - MOCK_METHOD3(RemoveComponent, - bool(const std::string& path, - const std::string& name, - ErrorPtr* error)); - MOCK_METHOD4(RemoveComponentArrayItem, - bool(const std::string& path, - const std::string& name, - size_t index, - ErrorPtr* error)); - MOCK_METHOD1(AddComponentTreeChangedCallback, - void(const base::Closure& callback)); - MOCK_METHOD1(MockAddCommand, void(CommandInstance* command_instance)); - MOCK_METHOD5(MockParseCommandInstance, - CommandInstance*(const base::DictionaryValue& command, - Command::Origin command_origin, - UserRole role, - std::string* id, - ErrorPtr* error)); - MOCK_METHOD1(FindCommand, CommandInstance*(const std::string& id)); - MOCK_METHOD1(AddCommandAddedCallback, - void(const CommandQueue::CommandCallback& callback)); - MOCK_METHOD1(AddCommandRemovedCallback, - void(const CommandQueue::CommandCallback& callback)); - MOCK_METHOD3(AddCommandHandler, - void(const std::string& component_path, - const std::string& command_name, - const Device::CommandHandlerCallback& callback)); - MOCK_CONST_METHOD2(FindComponent, - const base::DictionaryValue*(const std::string& path, - ErrorPtr* error)); - MOCK_CONST_METHOD1(FindTraitDefinition, - const base::DictionaryValue*(const std::string& name)); - MOCK_CONST_METHOD1( - FindCommandDefinition, - const base::DictionaryValue*(const std::string& command_name)); - MOCK_CONST_METHOD3(GetMinimalRole, - bool(const std::string& command_name, - UserRole* minimal_role, - ErrorPtr* error)); - MOCK_CONST_METHOD0(GetTraits, const base::DictionaryValue&()); - MOCK_CONST_METHOD0(GetComponents, const base::DictionaryValue&()); - MOCK_METHOD3(SetStateProperties, - bool(const std::string& component_path, - const base::DictionaryValue& dict, - ErrorPtr* error)); - MOCK_METHOD3(SetStatePropertiesFromJson, - bool(const std::string& component_path, - const std::string& json, - ErrorPtr* error)); - MOCK_CONST_METHOD3(GetStateProperty, - const base::Value*(const std::string& component_path, - const std::string& name, - ErrorPtr* error)); - MOCK_METHOD4(SetStateProperty, - bool(const std::string& component_path, - const std::string& name, - const base::Value& value, - ErrorPtr* error)); - MOCK_METHOD1(AddStateChangedCallback, void(const base::Closure& callback)); - MOCK_METHOD0(MockGetAndClearRecordedStateChanges, StateSnapshot&()); - MOCK_METHOD1(NotifyStateUpdatedOnServer, void(UpdateID id)); - MOCK_CONST_METHOD0(GetLastStateChangeId, UpdateID()); - MOCK_METHOD1(MockAddServerStateUpdatedCallback, - base::CallbackList::Subscription*( - const base::Callback& callback)); - MOCK_CONST_METHOD1(FindComponentWithTrait, - std::string(const std::string& trait)); - MOCK_METHOD2(AddLegacyCommandDefinitions, - bool(const base::DictionaryValue& dict, ErrorPtr* error)); - MOCK_METHOD2(AddLegacyStateDefinitions, - bool(const base::DictionaryValue& dict, ErrorPtr* error)); - MOCK_CONST_METHOD0(GetLegacyState, const base::DictionaryValue&()); - MOCK_CONST_METHOD0(GetLegacyCommandDefinitions, - const base::DictionaryValue&()); - - private: - void AddCommand(std::unique_ptr command_instance) override { - MockAddCommand(command_instance.get()); - } - std::unique_ptr ParseCommandInstance( - const base::DictionaryValue& command, - Command::Origin command_origin, - UserRole role, - std::string* id, - ErrorPtr* error) { - return std::unique_ptr{ - MockParseCommandInstance(command, command_origin, role, id, error)}; - } - StateSnapshot GetAndClearRecordedStateChanges() override { - return std::move(MockGetAndClearRecordedStateChanges()); - } - Token AddServerStateUpdatedCallback( - const base::Callback& callback) override { - return Token{MockAddServerStateUpdatedCallback(callback)}; - } -}; - -} // namespace weave - -#endif // LIBWEAVE_SRC_COMPONENT_MANAGER_H_ diff --git a/src/test/mock_component_manager.h b/src/test/mock_component_manager.h new file mode 100644 index 0000000..1f470c2 --- /dev/null +++ b/src/test/mock_component_manager.h @@ -0,0 +1,134 @@ +// Copyright 2015 The Weave Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef LIBWEAVE_SRC_MOCK_COMPONENT_MANAGER_H_ +#define LIBWEAVE_SRC_MOCK_COMPONENT_MANAGER_H_ + +#include "src/component_manager.h" + +#include + +namespace weave { + +namespace test { + +class MockComponentManager : public ComponentManager { + public: + ~MockComponentManager() override {} + MOCK_METHOD2(LoadTraits, + bool(const base::DictionaryValue& dict, ErrorPtr* error)); + MOCK_METHOD2(LoadTraits, bool(const std::string& json, ErrorPtr* error)); + MOCK_METHOD1(AddTraitDefChangedCallback, void(const base::Closure& callback)); + MOCK_METHOD4(AddComponent, + bool(const std::string& path, + const std::string& name, + const std::vector& traits, + ErrorPtr* error)); + MOCK_METHOD4(AddComponentArrayItem, + bool(const std::string& path, + const std::string& name, + const std::vector& traits, + ErrorPtr* error)); + MOCK_METHOD3(RemoveComponent, + bool(const std::string& path, + const std::string& name, + ErrorPtr* error)); + MOCK_METHOD4(RemoveComponentArrayItem, + bool(const std::string& path, + const std::string& name, + size_t index, + ErrorPtr* error)); + MOCK_METHOD1(AddComponentTreeChangedCallback, + void(const base::Closure& callback)); + MOCK_METHOD1(MockAddCommand, void(CommandInstance* command_instance)); + MOCK_METHOD5(MockParseCommandInstance, + CommandInstance*(const base::DictionaryValue& command, + Command::Origin command_origin, + UserRole role, + std::string* id, + ErrorPtr* error)); + MOCK_METHOD1(FindCommand, CommandInstance*(const std::string& id)); + MOCK_METHOD1(AddCommandAddedCallback, + void(const CommandQueue::CommandCallback& callback)); + MOCK_METHOD1(AddCommandRemovedCallback, + void(const CommandQueue::CommandCallback& callback)); + MOCK_METHOD3(AddCommandHandler, + void(const std::string& component_path, + const std::string& command_name, + const Device::CommandHandlerCallback& callback)); + MOCK_CONST_METHOD2(FindComponent, + const base::DictionaryValue*(const std::string& path, + ErrorPtr* error)); + MOCK_CONST_METHOD1(FindTraitDefinition, + const base::DictionaryValue*(const std::string& name)); + MOCK_CONST_METHOD1( + FindCommandDefinition, + const base::DictionaryValue*(const std::string& command_name)); + MOCK_CONST_METHOD3(GetMinimalRole, + bool(const std::string& command_name, + UserRole* minimal_role, + ErrorPtr* error)); + MOCK_CONST_METHOD0(GetTraits, const base::DictionaryValue&()); + MOCK_CONST_METHOD0(GetComponents, const base::DictionaryValue&()); + MOCK_METHOD3(SetStateProperties, + bool(const std::string& component_path, + const base::DictionaryValue& dict, + ErrorPtr* error)); + MOCK_METHOD3(SetStatePropertiesFromJson, + bool(const std::string& component_path, + const std::string& json, + ErrorPtr* error)); + MOCK_CONST_METHOD3(GetStateProperty, + const base::Value*(const std::string& component_path, + const std::string& name, + ErrorPtr* error)); + MOCK_METHOD4(SetStateProperty, + bool(const std::string& component_path, + const std::string& name, + const base::Value& value, + ErrorPtr* error)); + MOCK_METHOD1(AddStateChangedCallback, void(const base::Closure& callback)); + MOCK_METHOD0(MockGetAndClearRecordedStateChanges, StateSnapshot&()); + MOCK_METHOD1(NotifyStateUpdatedOnServer, void(UpdateID id)); + MOCK_CONST_METHOD0(GetLastStateChangeId, UpdateID()); + MOCK_METHOD1(MockAddServerStateUpdatedCallback, + base::CallbackList::Subscription*( + const base::Callback& callback)); + MOCK_CONST_METHOD1(FindComponentWithTrait, + std::string(const std::string& trait)); + MOCK_METHOD2(AddLegacyCommandDefinitions, + bool(const base::DictionaryValue& dict, ErrorPtr* error)); + MOCK_METHOD2(AddLegacyStateDefinitions, + bool(const base::DictionaryValue& dict, ErrorPtr* error)); + MOCK_CONST_METHOD0(GetLegacyState, const base::DictionaryValue&()); + MOCK_CONST_METHOD0(GetLegacyCommandDefinitions, + const base::DictionaryValue&()); + + private: + void AddCommand(std::unique_ptr command_instance) override { + MockAddCommand(command_instance.get()); + } + std::unique_ptr ParseCommandInstance( + const base::DictionaryValue& command, + Command::Origin command_origin, + UserRole role, + std::string* id, + ErrorPtr* error) { + return std::unique_ptr{ + MockParseCommandInstance(command, command_origin, role, id, error)}; + } + StateSnapshot GetAndClearRecordedStateChanges() override { + return std::move(MockGetAndClearRecordedStateChanges()); + } + Token AddServerStateUpdatedCallback( + const base::Callback& callback) override { + return Token{MockAddServerStateUpdatedCallback(callback)}; + } +}; + +} // namespace test + +} // namespace weave + +#endif // LIBWEAVE_SRC_COMPONENT_MANAGER_H_ -- cgit v1.2.3