Revise the SystemState hierarchy.
* Removed all #includes from SystemState; added includes in .cc files
that use the various objects (MetricsLibrary, DevicePolicy, etc).
* MockSystemState:
- Regulated the set of getters/setters: foo() returns the current Foo
object interface; this object can be overridden by set_foo();
mock_foo() or fake_foo() returns the default (internal) mock/fake
equivalent, and fails if it is different from foo() (safety).
- Make member declaration order consistent with that of API.
- Removed MOCK_METHOD declarations for two methods and replaced them
with fake getter/setter. This means that MockSystemState is now
reduced to a fake, and can be renamed (separate CL). This also means
that a few tests have a slightly different semantics now.
* All virtual overrides are qualified as such. However, removed the
'const' method qualified from all getters: it made little sense,
especially when considering that getters are handing addresses of
internal mock members.
* Made the UpdateAttempter a contained member of both
{Real,Mock}SystemState, resolving initialization dependencies. In
general, the invariant is that all members of the SystemState that
rely on it being fully populated by the time of their initialization,
need to export a separate Init() method, that will be called (by the
SystemState implementation constructor or Init() method) only after
all members are set.
* Made the mock GPIO handler and connection manager contained members of
MockSystemState; the destructor could safely be moved.
* Cleanup in UpdateAttempter (part of resolving dependencies):
- Ordinary member initialization done via default initializers
(constants) or initializer list in the constructor (parameters).
- Init() method only does work that cannot be done during
construction, with appropriate comment documenting the need for it.
- Better reuse via constructor delegation.
BUG=chromium:358278
TEST=Unit tests.
Change-Id: I96ff6fc7e7400b0a9feb6cc8d4ffe97a51000f91
Reviewed-on: https://chromium-review.googlesource.com/193587
Reviewed-by: Gilad Arnold <garnold@chromium.org>
Tested-by: Gilad Arnold <garnold@chromium.org>
Commit-Queue: David Zeuthen <zeuthen@chromium.org>
diff --git a/mock_system_state.cc b/mock_system_state.cc
index e7ec886..a821836 100644
--- a/mock_system_state.cc
+++ b/mock_system_state.cc
@@ -12,28 +12,26 @@
// Mock the SystemStateInterface so that we could lie that
// OOBE is completed even when there's no such marker file, etc.
MockSystemState::MockSystemState()
- : default_request_params_(this),
- clock_(&default_clock_),
- hardware_(&default_hardware_),
+ : mock_connection_manager_(this),
+ mock_update_attempter_(this, &dbus_),
+ default_request_params_(this),
+ clock_(&fake_clock_),
+ connection_manager_(&mock_connection_manager_),
+ hardware_(&fake_hardware_),
+ metrics_lib_(&mock_metrics_lib_),
prefs_(&mock_prefs_),
powerwash_safe_prefs_(&mock_powerwash_safe_prefs_),
- p2p_manager_(&mock_p2p_manager_),
payload_state_(&mock_payload_state_),
- policy_manager_(&fake_policy_manager_) {
- request_params_ = &default_request_params_;
+ gpio_handler_(&mock_gpio_handler_),
+ update_attempter_(&mock_update_attempter_),
+ request_params_(&default_request_params_),
+ p2p_manager_(&mock_p2p_manager_),
+ policy_manager_(&fake_policy_manager_),
+ device_policy_(nullptr),
+ fake_system_rebooted_(false) {
mock_payload_state_.Initialize(this);
- mock_gpio_handler_ = new testing::NiceMock<MockGpioHandler>();
- mock_update_attempter_ = new testing::NiceMock<UpdateAttempterMock>(
- this, &dbus_);
- mock_connection_manager_ = new testing::NiceMock<MockConnectionManager>(this);
- connection_manager_ = mock_connection_manager_;
+ mock_update_attempter_.Init();
fake_policy_manager_.Init(FakeState::Construct());
}
-MockSystemState::~MockSystemState() {
- delete mock_connection_manager_;
- delete mock_update_attempter_;
- delete mock_gpio_handler_;
-}
-
} // namespace chromeos_update_engine