Rename MockSystemState into FakeSystemState.
This class is no longer a mock. The change also includes renaming the
appropriate files and the instances of this class.
BUG=chromium:358278
TEST=Unit tests.
Change-Id: Ifc20ead0d624eddf8827a6e6f39cd9b9207dcabf
Reviewed-on: https://chromium-review.googlesource.com/194088
Reviewed-by: Gilad Arnold <garnold@chromium.org>
Tested-by: Gilad Arnold <garnold@chromium.org>
Commit-Queue: David Zeuthen <zeuthen@chromium.org>
diff --git a/SConstruct b/SConstruct
index 3703b3e..98f47a9 100644
--- a/SConstruct
+++ b/SConstruct
@@ -258,9 +258,9 @@
utils.cc""")
main = ['main.cc']
-unittest_sources = Split("""action_unittest.cc
- action_pipe_unittest.cc
+unittest_sources = Split("""action_pipe_unittest.cc
action_processor_unittest.cc
+ action_unittest.cc
bzip_extent_writer_unittest.cc
certificate_checker_unittest.cc
chrome_browser_proxy_resolver_unittest.cc
@@ -272,6 +272,7 @@
extent_mapper_unittest.cc
extent_ranges_unittest.cc
extent_writer_unittest.cc
+ fake_system_state.cc
file_writer_unittest.cc
filesystem_copier_action_unittest.cc
filesystem_iterator_unittest.cc
@@ -284,7 +285,6 @@
hwid_override_unittest.cc
metadata_unittest.cc
mock_http_fetcher.cc
- mock_system_state.cc
omaha_hash_calculator_unittest.cc
omaha_request_action_unittest.cc
omaha_request_params_unittest.cc
diff --git a/certificate_checker_unittest.cc b/certificate_checker_unittest.cc
index f41bc93..44c2d74 100644
--- a/certificate_checker_unittest.cc
+++ b/certificate_checker_unittest.cc
@@ -13,7 +13,7 @@
#include "update_engine/certificate_checker.h"
#include "update_engine/certificate_checker_mock.h"
#include "update_engine/constants.h"
-#include "update_engine/mock_system_state.h"
+#include "update_engine/fake_system_state.h"
#include "update_engine/prefs_mock.h"
using ::testing::_;
@@ -47,15 +47,15 @@
depth_);
kCertChanged = "Updater.ServerCertificateChanged";
kCertFailed = "Updater.ServerCertificateFailed";
- CertificateChecker::set_system_state(&mock_system_state_);
+ CertificateChecker::set_system_state(&fake_system_state_);
CertificateChecker::set_openssl_wrapper(&openssl_wrapper_);
- prefs_ = mock_system_state_.mock_prefs();
+ prefs_ = fake_system_state_.mock_prefs();
}
virtual void TearDown() {}
- MockSystemState mock_system_state_;
- PrefsMock* prefs_; // shortcut to mock_system_state_.mock_prefs()
+ FakeSystemState fake_system_state_;
+ PrefsMock* prefs_; // shortcut to fake_system_state_.mock_prefs()
OpenSSLWrapperMock openssl_wrapper_;
// Parameters of our mock certificate digest.
int depth_;
@@ -143,7 +143,7 @@
Return(true)));
EXPECT_CALL(*prefs_, GetString(kPrefsCertificateReportToSendDownload, _))
.WillOnce(Return(false));
- EXPECT_CALL(*mock_system_state_.mock_metrics_lib(),
+ EXPECT_CALL(*fake_system_state_.mock_metrics_lib(),
SendUserActionToUMA(kCertChanged))
.WillOnce(Return(true));
EXPECT_CALL(*prefs_, Delete(kPrefsCertificateReportToSendUpdate))
@@ -162,7 +162,7 @@
Return(true)));
EXPECT_CALL(*prefs_, GetString(kPrefsCertificateReportToSendDownload, _))
.WillOnce(Return(false));
- EXPECT_CALL(*mock_system_state_.mock_metrics_lib(),
+ EXPECT_CALL(*fake_system_state_.mock_metrics_lib(),
SendUserActionToUMA(_)).Times(0);
EXPECT_CALL(*prefs_, SetString(_,_)).Times(0);
CertificateChecker::FlushReport();
diff --git a/connection_manager_unittest.cc b/connection_manager_unittest.cc
index d574408..6b3e26b 100644
--- a/connection_manager_unittest.cc
+++ b/connection_manager_unittest.cc
@@ -8,8 +8,8 @@
#include <string>
#include "update_engine/connection_manager.h"
+#include "update_engine/fake_system_state.h"
#include "update_engine/mock_dbus_wrapper.h"
-#include "update_engine/mock_system_state.h"
using std::set;
using std::string;
@@ -27,8 +27,8 @@
: kMockFlimFlamManagerProxy_(NULL),
kMockFlimFlamServiceProxy_(NULL),
kServicePath_(NULL),
- cmut_(&mock_system_state_) {
- mock_system_state_.set_connection_manager(&cmut_);
+ cmut_(&fake_system_state_) {
+ fake_system_state_.set_connection_manager(&cmut_);
}
protected:
@@ -56,7 +56,7 @@
const char* kServicePath_;
MockDBusWrapper dbus_iface_;
ConnectionManager cmut_; // ConnectionManager under test.
- MockSystemState mock_system_state_;
+ FakeSystemState fake_system_state_;
};
// static
@@ -251,7 +251,7 @@
TEST_F(ConnectionManagerTest, AllowUpdatesOnlyOver3GPerPolicyTest) {
policy::MockDevicePolicy allow_3g_policy;
- mock_system_state_.set_device_policy(&allow_3g_policy);
+ fake_system_state_.set_device_policy(&allow_3g_policy);
// This test tests cellular (3G) being the only connection type being allowed.
set<string> allowed_set;
@@ -268,7 +268,7 @@
TEST_F(ConnectionManagerTest, AllowUpdatesOver3GAndOtherTypesPerPolicyTest) {
policy::MockDevicePolicy allow_3g_policy;
- mock_system_state_.set_device_policy(&allow_3g_policy);
+ fake_system_state_.set_device_policy(&allow_3g_policy);
// This test tests multiple connection types being allowed, with
// 3G one among them. Only Cellular is currently enforced by the policy
@@ -317,7 +317,7 @@
TEST_F(ConnectionManagerTest, BlockUpdatesOver3GPerPolicyTest) {
policy::MockDevicePolicy block_3g_policy;
- mock_system_state_.set_device_policy(&block_3g_policy);
+ fake_system_state_.set_device_policy(&block_3g_policy);
// Test that updates for 3G are blocked while updates are allowed
// over several other types.
@@ -337,7 +337,7 @@
TEST_F(ConnectionManagerTest, BlockUpdatesOver3GIfErrorInPolicyFetchTest) {
policy::MockDevicePolicy allow_3g_policy;
- mock_system_state_.set_device_policy(&allow_3g_policy);
+ fake_system_state_.set_device_policy(&allow_3g_policy);
set<string> allowed_set;
allowed_set.insert(cmut_.StringForConnectionType(kNetCellular));
@@ -355,9 +355,9 @@
TEST_F(ConnectionManagerTest, UseUserPrefForUpdatesOverCellularIfNoPolicyTest) {
policy::MockDevicePolicy no_policy;
- testing::NiceMock<PrefsMock>* prefs = mock_system_state_.mock_prefs();
+ testing::NiceMock<PrefsMock>* prefs = fake_system_state_.mock_prefs();
- mock_system_state_.set_device_policy(&no_policy);
+ fake_system_state_.set_device_policy(&no_policy);
// No setting enforced by the device policy, user prefs should be used.
EXPECT_CALL(no_policy, GetAllowedConnectionTypesForUpdate(_))
diff --git a/delta_performer_unittest.cc b/delta_performer_unittest.cc
index cbd831d..0a19aa2 100644
--- a/delta_performer_unittest.cc
+++ b/delta_performer_unittest.cc
@@ -21,9 +21,9 @@
#include "update_engine/delta_performer.h"
#include "update_engine/extent_ranges.h"
#include "update_engine/fake_hardware.h"
+#include "update_engine/fake_system_state.h"
#include "update_engine/full_update_generator.h"
#include "update_engine/graph_types.h"
-#include "update_engine/mock_system_state.h"
#include "update_engine/payload_signer.h"
#include "update_engine/prefs_mock.h"
#include "update_engine/test_utils.h"
@@ -69,7 +69,7 @@
// The mock system state object with which we initialize the
// delta performer.
- MockSystemState mock_system_state;
+ FakeSystemState fake_system_state;
};
enum SignatureTest {
@@ -652,7 +652,7 @@
EXPECT_FALSE(install_plan.metadata_signature.empty());
*performer = new DeltaPerformer(&prefs,
- &state->mock_system_state,
+ &state->fake_system_state,
&install_plan);
EXPECT_TRUE(utils::FileExists(kUnittestPublicKeyPath));
(*performer)->set_public_key_path(kUnittestPublicKeyPath);
@@ -733,7 +733,7 @@
}
int expected_times = (expected_result == kErrorCodeSuccess) ? 1 : 0;
- EXPECT_CALL(*(state->mock_system_state.mock_payload_state()),
+ EXPECT_CALL(*(state->fake_system_state.mock_payload_state()),
DownloadComplete()).Times(expected_times);
LOG(INFO) << "Verifying payload for expected result "
@@ -826,8 +826,8 @@
PrefsMock prefs;
InstallPlan install_plan;
install_plan.hash_checks_mandatory = hash_checks_mandatory;
- MockSystemState mock_system_state;
- DeltaPerformer performer(&prefs, &mock_system_state, &install_plan);
+ FakeSystemState fake_system_state;
+ DeltaPerformer performer(&prefs, &fake_system_state, &install_plan);
EXPECT_EQ(0, performer.Open("/dev/null", 0, 0));
EXPECT_TRUE(performer.OpenKernel("/dev/null"));
@@ -922,7 +922,7 @@
// Create the delta performer object.
PrefsMock prefs;
DeltaPerformer delta_performer(&prefs,
- &state.mock_system_state,
+ &state.fake_system_state,
&install_plan);
// Use the public key corresponding to the private key used above to
@@ -967,8 +967,8 @@
ErrorCode expected) {
PrefsMock prefs;
InstallPlan install_plan;
- MockSystemState mock_system_state;
- DeltaPerformer performer(&prefs, &mock_system_state, &install_plan);
+ FakeSystemState fake_system_state;
+ DeltaPerformer performer(&prefs, &fake_system_state, &install_plan);
// The install plan is for Full or Delta.
install_plan.is_full_update = full_payload;
@@ -1148,8 +1148,8 @@
TEST(DeltaPerformerTest, BadDeltaMagicTest) {
PrefsMock prefs;
InstallPlan install_plan;
- MockSystemState mock_system_state;
- DeltaPerformer performer(&prefs, &mock_system_state, &install_plan);
+ FakeSystemState fake_system_state;
+ DeltaPerformer performer(&prefs, &fake_system_state, &install_plan);
EXPECT_EQ(0, performer.Open("/dev/null", 0, 0));
EXPECT_TRUE(performer.OpenKernel("/dev/null"));
EXPECT_TRUE(performer.Write("junk", 4));
@@ -1177,14 +1177,14 @@
TEST(DeltaPerformerTest, WriteUpdatesPayloadState) {
PrefsMock prefs;
InstallPlan install_plan;
- MockSystemState mock_system_state;
- DeltaPerformer performer(&prefs, &mock_system_state, &install_plan);
+ FakeSystemState fake_system_state;
+ DeltaPerformer performer(&prefs, &fake_system_state, &install_plan);
EXPECT_EQ(0, performer.Open("/dev/null", 0, 0));
EXPECT_TRUE(performer.OpenKernel("/dev/null"));
- EXPECT_CALL(*(mock_system_state.mock_payload_state()),
+ EXPECT_CALL(*(fake_system_state.mock_payload_state()),
DownloadProgress(4)).Times(1);
- EXPECT_CALL(*(mock_system_state.mock_payload_state()),
+ EXPECT_CALL(*(fake_system_state.mock_payload_state()),
DownloadProgress(8)).Times(2);
EXPECT_TRUE(performer.Write("junk", 4));
@@ -1248,7 +1248,7 @@
TEST(DeltaPerformerTest, UsePublicKeyFromResponse) {
PrefsMock prefs;
- MockSystemState mock_system_state;
+ FakeSystemState fake_system_state;
InstallPlan install_plan;
base::FilePath key_path;
@@ -1265,9 +1265,9 @@
// b. there is no key in the root filesystem.
DeltaPerformer *performer = new DeltaPerformer(&prefs,
- &mock_system_state,
+ &fake_system_state,
&install_plan);
- FakeHardware* fake_hardware = mock_system_state.fake_hardware();
+ FakeHardware* fake_hardware = fake_system_state.fake_hardware();
string temp_dir;
EXPECT_TRUE(utils::MakeTempDirectory("PublicKeyFromResponseTests.XXXXXX",
diff --git a/download_action_unittest.cc b/download_action_unittest.cc
index b238c69..20b616e 100644
--- a/download_action_unittest.cc
+++ b/download_action_unittest.cc
@@ -16,10 +16,10 @@
#include "update_engine/action_pipe.h"
#include "update_engine/download_action.h"
-#include "update_engine/mock_http_fetcher.h"
-#include "update_engine/mock_system_state.h"
-#include "update_engine/omaha_hash_calculator.h"
#include "update_engine/fake_p2p_manager_configuration.h"
+#include "update_engine/fake_system_state.h"
+#include "update_engine/mock_http_fetcher.h"
+#include "update_engine/omaha_hash_calculator.h"
#include "update_engine/prefs_mock.h"
#include "update_engine/test_utils.h"
#include "update_engine/utils.h"
@@ -468,14 +468,14 @@
// Setup p2p.
FakeP2PManagerConfiguration *test_conf = new FakeP2PManagerConfiguration();
p2p_manager_.reset(P2PManager::Construct(test_conf, NULL, "cros_au", 3));
- mock_system_state_.set_p2p_manager(p2p_manager_.get());
+ fake_system_state_.set_p2p_manager(p2p_manager_.get());
}
// To be called by tests to perform the download. The
// |use_p2p_to_share| parameter is used to indicate whether the
// payload should be shared via p2p.
void StartDownload(bool use_p2p_to_share) {
- mock_system_state_.request_params()->set_use_p2p_for_sharing(
+ fake_system_state_.request_params()->set_use_p2p_for_sharing(
use_p2p_to_share);
ScopedTempFile output_temp_file;
@@ -497,7 +497,7 @@
data_.length(),
NULL);
// Note that DownloadAction takes ownership of the passed in HttpFetcher.
- download_action_.reset(new DownloadAction(&prefs, &mock_system_state_,
+ download_action_.reset(new DownloadAction(&prefs, &fake_system_state_,
http_fetcher_));
download_action_->SetTestFileWriter(&writer);
BondActions(&feeder_action, download_action_.get());
@@ -527,7 +527,7 @@
ActionProcessor processor_;
// A fake system state.
- MockSystemState mock_system_state_;
+ FakeSystemState fake_system_state_;
// The data being downloaded.
string data_;
diff --git a/mock_system_state.cc b/fake_system_state.cc
similarity index 93%
rename from mock_system_state.cc
rename to fake_system_state.cc
index a821836..a4fbbeb 100644
--- a/mock_system_state.cc
+++ b/fake_system_state.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "update_engine/mock_system_state.h"
+#include "update_engine/fake_system_state.h"
#include "update_engine/policy_manager/fake_state.h"
using chromeos_policy_manager::FakeState;
@@ -11,7 +11,7 @@
// Mock the SystemStateInterface so that we could lie that
// OOBE is completed even when there's no such marker file, etc.
-MockSystemState::MockSystemState()
+FakeSystemState::FakeSystemState()
: mock_connection_manager_(this),
mock_update_attempter_(this, &dbus_),
default_request_params_(this),
diff --git a/mock_system_state.h b/fake_system_state.h
similarity index 96%
rename from mock_system_state.h
rename to fake_system_state.h
index 7d79b77..653849e 100644
--- a/mock_system_state.h
+++ b/fake_system_state.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_MOCK_SYSTEM_STATE_H_
-#define CHROMEOS_PLATFORM_UPDATE_ENGINE_MOCK_SYSTEM_STATE_H_
+#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_FAKE_SYSTEM_STATE_H_
+#define CHROMEOS_PLATFORM_UPDATE_ENGINE_FAKE_SYSTEM_STATE_H_
#include <base/logging.h>
#include <gmock/gmock.h>
@@ -26,9 +26,9 @@
// Mock the SystemStateInterface so that we could lie that
// OOBE is completed even when there's no such marker file, etc.
-class MockSystemState : public SystemState {
+class FakeSystemState : public SystemState {
public:
- MockSystemState();
+ FakeSystemState();
// Base class overrides. All getters return the current implementation of
// various members, either the default (fake/mock) or the one set to override
@@ -262,4 +262,4 @@
} // namespace chromeos_update_engine
-#endif // CHROMEOS_PLATFORM_UPDATE_ENGINE_MOCK_SYSTEM_STATE_H_
+#endif // CHROMEOS_PLATFORM_UPDATE_ENGINE_FAKE_SYSTEM_STATE_H_
diff --git a/filesystem_copier_action_unittest.cc b/filesystem_copier_action_unittest.cc
index 891fd51..81c5bce 100644
--- a/filesystem_copier_action_unittest.cc
+++ b/filesystem_copier_action_unittest.cc
@@ -15,10 +15,10 @@
#include <gmock/gmock.h>
#include <gtest/gtest.h>
+#include "update_engine/fake_system_state.h"
#include "update_engine/filesystem_copier_action.h"
#include "update_engine/filesystem_iterator.h"
#include "update_engine/mock_hardware.h"
-#include "update_engine/mock_system_state.h"
#include "update_engine/omaha_hash_calculator.h"
#include "update_engine/test_utils.h"
#include "update_engine/utils.h"
@@ -43,7 +43,7 @@
void TearDown() {
}
- MockSystemState mock_system_state_;
+ FakeSystemState fake_system_state_;
};
class FilesystemCopierActionTestDelegate : public ActionProcessorDelegate {
@@ -125,7 +125,7 @@
// We need MockHardware to verify MarkUnbootable calls, but don't want
// warnings about other usages.
testing::NiceMock<MockHardware> mock_hardware;
- mock_system_state_.set_hardware(&mock_hardware);
+ fake_system_state_.set_hardware(&mock_hardware);
GMainLoop *loop = g_main_loop_new(g_main_context_default(), FALSE);
@@ -209,7 +209,7 @@
ActionProcessor processor;
ObjectFeederAction<InstallPlan> feeder_action;
- FilesystemCopierAction copier_action(&mock_system_state_,
+ FilesystemCopierAction copier_action(&fake_system_state_,
use_kernel_partition,
verify_hash != 0);
ObjectCollectorAction<InstallPlan> collector_action;
@@ -311,7 +311,7 @@
processor.set_delegate(&delegate);
- FilesystemCopierAction copier_action(&mock_system_state_, false, false);
+ FilesystemCopierAction copier_action(&fake_system_state_, false, false);
ObjectCollectorAction<InstallPlan> collector_action;
BondActions(&copier_action, &collector_action);
@@ -334,7 +334,7 @@
const char* kUrl = "http://some/url";
InstallPlan install_plan(false, true, kUrl, 0, "", 0, "", "", "", "");
feeder_action.set_obj(install_plan);
- FilesystemCopierAction copier_action(&mock_system_state_, false, false);
+ FilesystemCopierAction copier_action(&fake_system_state_, false, false);
ObjectCollectorAction<InstallPlan> collector_action;
BondActions(&feeder_action, &copier_action);
@@ -368,7 +368,7 @@
"/no/such/file",
"");
feeder_action.set_obj(install_plan);
- FilesystemCopierAction copier_action(&mock_system_state_, false, false);
+ FilesystemCopierAction copier_action(&fake_system_state_, false, false);
ObjectCollectorAction<InstallPlan> collector_action;
BondActions(&copier_action, &collector_action);
@@ -417,7 +417,7 @@
for (int i = 0; i < 2; ++i) {
bool is_kernel = i == 1;
- FilesystemCopierAction action(&mock_system_state_, is_kernel, false);
+ FilesystemCopierAction action(&fake_system_state_, is_kernel, false);
EXPECT_EQ(kint64max, action.filesystem_size_);
{
int fd = HANDLE_EINTR(open(img.c_str(), O_RDONLY));
diff --git a/http_fetcher_unittest.cc b/http_fetcher_unittest.cc
index a37becd..dc00139 100644
--- a/http_fetcher_unittest.cc
+++ b/http_fetcher_unittest.cc
@@ -20,11 +20,11 @@
#include <glib.h>
#include <gtest/gtest.h>
+#include "update_engine/fake_system_state.h"
#include "update_engine/http_common.h"
#include "update_engine/libcurl_http_fetcher.h"
#include "update_engine/mock_connection_manager.h"
#include "update_engine/mock_http_fetcher.h"
-#include "update_engine/mock_system_state.h"
#include "update_engine/multi_range_http_fetcher.h"
#include "update_engine/proxy_resolver.h"
#include "update_engine/utils.h"
@@ -195,8 +195,8 @@
class AnyHttpFetcherTest {
public:
AnyHttpFetcherTest()
- : mock_connection_manager_(&mock_system_state_) {
- mock_system_state_.set_connection_manager(&mock_connection_manager_);
+ : mock_connection_manager_(&fake_system_state_) {
+ fake_system_state_.set_connection_manager(&mock_connection_manager_);
}
virtual HttpFetcher* NewLargeFetcher(size_t num_proxies) = 0;
@@ -222,7 +222,7 @@
protected:
DirectProxyResolver proxy_resolver_;
- MockSystemState mock_system_state_;
+ FakeSystemState fake_system_state_;
MockConnectionManager mock_connection_manager_;
};
@@ -268,11 +268,11 @@
proxy_resolver_.set_num_proxies(num_proxies);
LibcurlHttpFetcher *ret = new
LibcurlHttpFetcher(reinterpret_cast<ProxyResolver*>(&proxy_resolver_),
- &mock_system_state_, false);
+ &fake_system_state_, false);
// Speed up test execution.
ret->set_idle_seconds(1);
ret->set_retry_seconds(1);
- mock_system_state_.fake_hardware()->SetIsOfficialBuild(false);
+ fake_system_state_.fake_hardware()->SetIsOfficialBuild(false);
return ret;
}
@@ -317,13 +317,13 @@
reinterpret_cast<ProxyResolver*>(&proxy_resolver_);
MultiRangeHttpFetcher *ret =
new MultiRangeHttpFetcher(
- new LibcurlHttpFetcher(resolver, &mock_system_state_, false));
+ new LibcurlHttpFetcher(resolver, &fake_system_state_, false));
ret->ClearRanges();
ret->AddRange(0);
// Speed up test execution.
ret->set_idle_seconds(1);
ret->set_retry_seconds(1);
- mock_system_state_.fake_hardware()->SetIsOfficialBuild(false);
+ fake_system_state_.fake_hardware()->SetIsOfficialBuild(false);
return ret;
}
@@ -1050,7 +1050,7 @@
}
LOG(INFO) << "added range: " << tmp_str;
}
- dynamic_cast<MockSystemState*>(fetcher_in->GetSystemState())
+ dynamic_cast<FakeSystemState*>(fetcher_in->GetSystemState())
->fake_hardware()->SetIsOfficialBuild(false);
multi_fetcher->set_delegate(&delegate);
@@ -1238,8 +1238,8 @@
bool is_official_build = (i == 1);
LOG(INFO) << "is_update_allowed_over_connection: " << is_allowed;
LOG(INFO) << "is_official_build: " << is_official_build;
- // NewLargeFetcher creates the HttpFetcher* with a MockSystemState.
- dynamic_cast<MockSystemState*>(fetcher->GetSystemState())
+ // NewLargeFetcher creates the HttpFetcher* with a FakeSystemState.
+ dynamic_cast<FakeSystemState*>(fetcher->GetSystemState())
->fake_hardware()->SetIsOfficialBuild(is_official_build);
fetcher->set_delegate(&delegate);
diff --git a/mock_http_fetcher.h b/mock_http_fetcher.h
index 50e8043..8fef9ab 100644
--- a/mock_http_fetcher.h
+++ b/mock_http_fetcher.h
@@ -10,9 +10,9 @@
#include <base/logging.h>
#include <glib.h>
+#include "update_engine/fake_system_state.h"
#include "update_engine/http_fetcher.h"
#include "update_engine/mock_connection_manager.h"
-#include "update_engine/mock_system_state.h"
// This is a mock implementation of HttpFetcher which is useful for testing.
// All data must be passed into the ctor. When started, MockHttpFetcher will
@@ -33,15 +33,15 @@
MockHttpFetcher(const char* data,
size_t size,
ProxyResolver* proxy_resolver)
- : HttpFetcher(proxy_resolver, &mock_system_state_),
+ : HttpFetcher(proxy_resolver, &fake_system_state_),
sent_size_(0),
timeout_source_(NULL),
timout_tag_(0),
paused_(false),
fail_transfer_(false),
never_use_(false),
- mock_connection_manager_(&mock_system_state_) {
- mock_system_state_.set_connection_manager(&mock_connection_manager_);
+ mock_connection_manager_(&fake_system_state_) {
+ fake_system_state_.set_connection_manager(&mock_connection_manager_);
data_.insert(data_.end(), data, data + size);
}
@@ -131,7 +131,7 @@
// Set to true if BeginTransfer should EXPECT fail.
bool never_use_;
- MockSystemState mock_system_state_;
+ FakeSystemState fake_system_state_;
MockConnectionManager mock_connection_manager_;
DISALLOW_COPY_AND_ASSIGN(MockHttpFetcher);
diff --git a/omaha_request_action_unittest.cc b/omaha_request_action_unittest.cc
index ea0b4c2..9de0e9f 100644
--- a/omaha_request_action_unittest.cc
+++ b/omaha_request_action_unittest.cc
@@ -42,9 +42,9 @@
namespace {
-MockSystemState mock_system_state;
+FakeSystemState fake_system_state;
OmahaRequestParams kDefaultTestParams(
- &mock_system_state,
+ &fake_system_state,
OmahaRequestParams::kOsPlatform,
OmahaRequestParams::kOsVersion,
"service_pack",
@@ -242,15 +242,15 @@
if (fail_http_response_code >= 0) {
fetcher->FailTransfer(fail_http_response_code);
}
- MockSystemState mock_system_state;
+ FakeSystemState fake_system_state;
if (prefs)
- mock_system_state.set_prefs(prefs);
+ fake_system_state.set_prefs(prefs);
if (payload_state)
- mock_system_state.set_payload_state(payload_state);
+ fake_system_state.set_payload_state(payload_state);
if (p2p_manager)
- mock_system_state.set_p2p_manager(p2p_manager);
- mock_system_state.set_request_params(¶ms);
- OmahaRequestAction action(&mock_system_state,
+ fake_system_state.set_p2p_manager(p2p_manager);
+ fake_system_state.set_request_params(¶ms);
+ OmahaRequestAction action(&fake_system_state,
NULL,
fetcher,
ping_only);
@@ -266,19 +266,19 @@
BondActions(&action, &collector_action);
processor.EnqueueAction(&collector_action);
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(_, _, _))
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendEnumToUMA(_, _, _))
.Times(AnyNumber());
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(),
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(),
SendEnumToUMA(metrics::kMetricCheckResult,
static_cast<int>(expected_check_result),
static_cast<int>(metrics::CheckResult::kNumConstants) - 1))
.Times(expected_check_result == metrics::CheckResult::kUnset ? 0 : 1);
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(),
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(),
SendEnumToUMA(metrics::kMetricCheckReaction,
static_cast<int>(expected_check_reaction),
static_cast<int>(metrics::CheckReaction::kNumConstants) - 1))
.Times(expected_check_reaction == metrics::CheckReaction::kUnset ? 0 : 1);
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(),
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(),
SendSparseToUMA(metrics::kMetricCheckDownloadErrorCode,
static_cast<int>(expected_download_error_code)))
.Times(expected_download_error_code == metrics::DownloadErrorCode::kUnset
@@ -305,9 +305,9 @@
MockHttpFetcher* fetcher = new MockHttpFetcher(http_response.data(),
http_response.size(),
NULL);
- MockSystemState mock_system_state;
- mock_system_state.set_request_params(¶ms);
- OmahaRequestAction action(&mock_system_state, event, fetcher, false);
+ FakeSystemState fake_system_state;
+ fake_system_state.set_request_params(¶ms);
+ OmahaRequestAction action(&fake_system_state, event, fetcher, false);
OmahaRequestActionTestProcessorDelegate delegate;
delegate.loop_ = loop;
ActionProcessor processor;
@@ -833,10 +833,10 @@
GMainLoop *loop = g_main_loop_new(g_main_context_default(), FALSE);
- MockSystemState mock_system_state;
+ FakeSystemState fake_system_state;
OmahaRequestParams params = kDefaultTestParams;
- mock_system_state.set_request_params(¶ms);
- OmahaRequestAction action(&mock_system_state, NULL,
+ fake_system_state.set_request_params(¶ms);
+ OmahaRequestAction action(&fake_system_state, NULL,
new MockHttpFetcher(http_response.data(),
http_response.size(),
NULL),
@@ -1027,10 +1027,10 @@
string http_response("doesn't matter");
GMainLoop *loop = g_main_loop_new(g_main_context_default(), FALSE);
- MockSystemState mock_system_state;
+ FakeSystemState fake_system_state;
OmahaRequestParams params = kDefaultTestParams;
- mock_system_state.set_request_params(¶ms);
- OmahaRequestAction action(&mock_system_state, NULL,
+ fake_system_state.set_request_params(¶ms);
+ OmahaRequestAction action(&fake_system_state, NULL,
new MockHttpFetcher(http_response.data(),
http_response.size(),
NULL),
@@ -1056,8 +1056,8 @@
vector<char> post_data;
// Make sure XML Encode is being called on the params
- MockSystemState mock_system_state;
- OmahaRequestParams params(&mock_system_state,
+ FakeSystemState fake_system_state;
+ OmahaRequestParams params(&fake_system_state,
OmahaRequestParams::kOsPlatform,
OmahaRequestParams::kOsVersion,
"testtheservice_pack>",
@@ -1272,11 +1272,11 @@
TEST(OmahaRequestActionTest, IsEventTest) {
string http_response("doesn't matter");
- MockSystemState mock_system_state;
+ FakeSystemState fake_system_state;
OmahaRequestParams params = kDefaultTestParams;
- mock_system_state.set_request_params(¶ms);
+ fake_system_state.set_request_params(¶ms);
OmahaRequestAction update_check_action(
- &mock_system_state,
+ &fake_system_state,
NULL,
new MockHttpFetcher(http_response.data(),
http_response.size(),
@@ -1285,9 +1285,9 @@
EXPECT_FALSE(update_check_action.IsEvent());
params = kDefaultTestParams;
- mock_system_state.set_request_params(¶ms);
+ fake_system_state.set_request_params(¶ms);
OmahaRequestAction event_action(
- &mock_system_state,
+ &fake_system_state,
new OmahaEvent(OmahaEvent::kTypeUpdateComplete),
new MockHttpFetcher(http_response.data(),
http_response.size(),
@@ -1301,8 +1301,8 @@
bool delta_okay = i == 1;
const char* delta_okay_str = delta_okay ? "true" : "false";
vector<char> post_data;
- MockSystemState mock_system_state;
- OmahaRequestParams params(&mock_system_state,
+ FakeSystemState fake_system_state;
+ OmahaRequestParams params(&fake_system_state,
OmahaRequestParams::kOsPlatform,
OmahaRequestParams::kOsVersion,
"service_pack",
@@ -1348,8 +1348,8 @@
bool interactive = i == 1;
const char* interactive_str = interactive ? "ondemandupdate" : "scheduler";
vector<char> post_data;
- MockSystemState mock_system_state;
- OmahaRequestParams params(&mock_system_state,
+ FakeSystemState fake_system_state;
+ OmahaRequestParams params(&fake_system_state,
OmahaRequestParams::kOsPlatform,
OmahaRequestParams::kOsVersion,
"service_pack",
@@ -2243,7 +2243,7 @@
// If there is no prefs and OOBE is not complete, we should not
// report anything to Omaha.
{
- MockSystemState system_state;
+ FakeSystemState system_state;
system_state.set_prefs(&prefs);
EXPECT_EQ(OmahaRequestAction::GetInstallDate(&system_state), -1);
EXPECT_FALSE(prefs.Exists(kPrefsInstallDateDays));
@@ -2254,24 +2254,24 @@
// prefs. However, first try with an invalid date and check we do
// nothing.
{
- MockSystemState mock_system_state;
- mock_system_state.set_prefs(&prefs);
+ FakeSystemState fake_system_state;
+ fake_system_state.set_prefs(&prefs);
Time oobe_date = Time::FromTimeT(42); // Dec 31, 1969 16:00:42 PST.
- mock_system_state.fake_hardware()->SetIsOOBEComplete(oobe_date);
- EXPECT_EQ(OmahaRequestAction::GetInstallDate(&mock_system_state), -1);
+ fake_system_state.fake_hardware()->SetIsOOBEComplete(oobe_date);
+ EXPECT_EQ(OmahaRequestAction::GetInstallDate(&fake_system_state), -1);
EXPECT_FALSE(prefs.Exists(kPrefsInstallDateDays));
}
// Then check with a valid date. The date Jan 20, 2007 0:00 PST
// should yield an InstallDate of 14.
{
- MockSystemState mock_system_state;
- mock_system_state.set_prefs(&prefs);
+ FakeSystemState fake_system_state;
+ fake_system_state.set_prefs(&prefs);
Time oobe_date = Time::FromTimeT(1169280000); // Jan 20, 2007 0:00 PST.
- mock_system_state.fake_hardware()->SetIsOOBEComplete(oobe_date);
- EXPECT_EQ(OmahaRequestAction::GetInstallDate(&mock_system_state), 14);
+ fake_system_state.fake_hardware()->SetIsOOBEComplete(oobe_date);
+ EXPECT_EQ(OmahaRequestAction::GetInstallDate(&fake_system_state), 14);
EXPECT_TRUE(prefs.Exists(kPrefsInstallDateDays));
int64_t prefs_days;
@@ -2284,12 +2284,12 @@
// 2007 0:00 PST should yield an InstallDate of 28... but since
// there's a prefs file, we should still get 14.
{
- MockSystemState mock_system_state;
- mock_system_state.set_prefs(&prefs);
+ FakeSystemState fake_system_state;
+ fake_system_state.set_prefs(&prefs);
Time oobe_date = Time::FromTimeT(1170144000); // Jan 30, 2007 0:00 PST.
- mock_system_state.fake_hardware()->SetIsOOBEComplete(oobe_date);
- EXPECT_EQ(OmahaRequestAction::GetInstallDate(&mock_system_state), 14);
+ fake_system_state.fake_hardware()->SetIsOOBEComplete(oobe_date);
+ EXPECT_EQ(OmahaRequestAction::GetInstallDate(&fake_system_state), 14);
int64_t prefs_days;
EXPECT_TRUE(prefs.GetInt64(kPrefsInstallDateDays, &prefs_days));
@@ -2297,7 +2297,7 @@
// If we delete the prefs file, we should get 28 days.
EXPECT_TRUE(prefs.Delete(kPrefsInstallDateDays));
- EXPECT_EQ(OmahaRequestAction::GetInstallDate(&mock_system_state), 28);
+ EXPECT_EQ(OmahaRequestAction::GetInstallDate(&fake_system_state), 28);
EXPECT_TRUE(prefs.GetInt64(kPrefsInstallDateDays, &prefs_days));
EXPECT_EQ(prefs_days, 28);
}
diff --git a/omaha_request_params_unittest.cc b/omaha_request_params_unittest.cc
index 5b615b8..01cf154 100644
--- a/omaha_request_params_unittest.cc
+++ b/omaha_request_params_unittest.cc
@@ -9,8 +9,8 @@
#include "base/file_util.h"
#include "gtest/gtest.h"
#include "update_engine/constants.h"
+#include "update_engine/fake_system_state.h"
#include "update_engine/install_plan.h"
-#include "update_engine/mock_system_state.h"
#include "update_engine/omaha_request_params.h"
#include "update_engine/test_utils.h"
#include "update_engine/utils.h"
@@ -21,7 +21,7 @@
class OmahaRequestParamsTest : public ::testing::Test {
public:
- OmahaRequestParamsTest() : params_(&mock_system_state_) {}
+ OmahaRequestParamsTest() : params_(&fake_system_state_) {}
protected:
// Return true iff the OmahaRequestParams::Init succeeded. If
@@ -39,7 +39,7 @@
kStatefulPartition + "/etc"));
// Create a fresh copy of the params for each test, so there's no
// unintended reuse of state across tests.
- OmahaRequestParams new_params(&mock_system_state_);
+ OmahaRequestParams new_params(&fake_system_state_);
params_ = new_params;
params_.set_root(test_dir_);
params_.SetLockDown(false);
@@ -50,7 +50,7 @@
}
OmahaRequestParams params_;
- MockSystemState mock_system_state_;
+ FakeSystemState fake_system_state_;
static const char* kTestDirTemplate;
string test_dir_;
@@ -89,7 +89,7 @@
"CHROMEOS_RELEASE_VERSION=0.2.2.3\n"
"CHROMEOS_RELEASE_TRACK=dev-channel\n"
"CHROMEOS_AUSERVER=http://www.google.com"));
- OmahaRequestParams out(&mock_system_state_);
+ OmahaRequestParams out(&fake_system_state_);
EXPECT_TRUE(DoTest(&out, "", ""));
EXPECT_EQ("Chrome OS", out.os_platform());
EXPECT_EQ(string("0.2.2.3_") + GetMachineType(), out.os_sp());
@@ -97,7 +97,7 @@
EXPECT_EQ("{87efface-864d-49a5-9bb3-4b050a7c227a}", out.GetAppId());
EXPECT_EQ("0.2.2.3", out.app_version());
EXPECT_EQ("en-US", out.app_lang());
- EXPECT_EQ(mock_system_state_.hardware()->GetHardwareClass(), out.hwid());
+ EXPECT_EQ(fake_system_state_.hardware()->GetHardwareClass(), out.hwid());
EXPECT_TRUE(out.delta_okay());
EXPECT_EQ("dev-channel", out.target_channel());
EXPECT_EQ("http://www.google.com", out.update_url());
@@ -112,7 +112,7 @@
"CHROMEOS_RELEASE_TRACK=dev-channel\n"
"CHROMEOS_RELEASE_APPID={58c35cef-9d30-476e-9098-ce20377d535d}\n"
"CHROMEOS_AUSERVER=http://www.google.com"));
- OmahaRequestParams out(&mock_system_state_);
+ OmahaRequestParams out(&fake_system_state_);
EXPECT_TRUE(DoTest(&out, "", ""));
EXPECT_EQ("Chrome OS", out.os_platform());
EXPECT_EQ(string("0.2.2.3_") + GetMachineType(), out.os_sp());
@@ -120,7 +120,7 @@
EXPECT_EQ("{58c35cef-9d30-476e-9098-ce20377d535d}", out.GetAppId());
EXPECT_EQ("0.2.2.3", out.app_version());
EXPECT_EQ("en-US", out.app_lang());
- EXPECT_EQ(mock_system_state_.hardware()->GetHardwareClass(), out.hwid());
+ EXPECT_EQ(fake_system_state_.hardware()->GetHardwareClass(), out.hwid());
EXPECT_TRUE(out.delta_okay());
EXPECT_EQ("dev-channel", out.target_channel());
EXPECT_EQ("http://www.google.com", out.update_url());
@@ -132,7 +132,7 @@
"CHROMEOS_RELEASE_FOO=bar\n"
"CHROMEOS_RELEASE_VERSION=0.2.2.3\n"
"CHROMEOS_RELEASE_TRXCK=dev-channel"));
- OmahaRequestParams out(&mock_system_state_);
+ OmahaRequestParams out(&fake_system_state_);
EXPECT_TRUE(DoTest(&out, "", ""));
EXPECT_EQ("Chrome OS", out.os_platform());
EXPECT_EQ(string("0.2.2.3_") + GetMachineType(), out.os_sp());
@@ -148,7 +148,7 @@
"CHROMEOS_RELEASE_FOO=CHROMEOS_RELEASE_VERSION=1.2.3.4\n"
"CHROMEOS_RELEASE_VERSION=0.2.2.3\n"
"CHROMEOS_RELEASE_TRXCK=dev-channel"));
- OmahaRequestParams out(&mock_system_state_);
+ OmahaRequestParams out(&fake_system_state_);
EXPECT_TRUE(DoTest(&out, "", ""));
EXPECT_EQ("Chrome OS", out.os_platform());
EXPECT_EQ(string("0.2.2.3_") + GetMachineType(), out.os_sp());
@@ -164,7 +164,7 @@
"CHROMEOS_RELEASE_BOARD=arm-generic\n"
"CHROMEOS_RELEASE_FOO=bar\n"
"CHROMEOS_RELEASE_TRACK=dev-channel"));
- OmahaRequestParams out(&mock_system_state_);
+ OmahaRequestParams out(&fake_system_state_);
EXPECT_TRUE(DoTest(&out, "", ""));
EXPECT_EQ("Chrome OS", out.os_platform());
EXPECT_EQ(string("_") + GetMachineType(), out.os_sp());
@@ -182,7 +182,7 @@
"CHROMEOS_RELEASE_BOARD=arm-generic\n"
"CHROMEOS_RELEASE_FOO=bar\n"
"CHROMEOS_RELEASE_TRACK=dev-channel"));
- OmahaRequestParams out(&mock_system_state_);
+ OmahaRequestParams out(&fake_system_state_);
EXPECT_TRUE(DoTest(&out, "ForcedVersion", ""));
EXPECT_EQ("Chrome OS", out.os_platform());
EXPECT_EQ(string("ForcedVersion_") + GetMachineType(), out.os_sp());
@@ -201,7 +201,7 @@
"CHROMEOS_RELEASE_FOO=bar\n"
"CHROMEOS_RELEASE_VERSION=0.2.2.3\n"
"CHROMEOS_RELEASE_TRACK=dev-channel"));
- OmahaRequestParams out(&mock_system_state_);
+ OmahaRequestParams out(&fake_system_state_);
EXPECT_TRUE(DoTest(&out, "", "http://forced.google.com"));
EXPECT_EQ("Chrome OS", out.os_platform());
EXPECT_EQ(string("0.2.2.3_") + GetMachineType(), out.os_sp());
@@ -221,7 +221,7 @@
"CHROMEOS_RELEASE_FOO=bar\n"
"CHROMEOS_RELEASE_VERSION=0.2.2.3\n"
"CHROMEOS_RELEASE_TRACK=dev-channel"));
- OmahaRequestParams out(&mock_system_state_);
+ OmahaRequestParams out(&fake_system_state_);
EXPECT_TRUE(DoTest(&out, "", ""));
EXPECT_EQ("Chrome OS", out.os_platform());
EXPECT_EQ(string("0.2.2.3_") + GetMachineType(), out.os_sp());
@@ -241,7 +241,7 @@
"CHROMEOS_RELEASE_VERSION=0.2.2.3\n"
"CHROMEOS_RELEASE_TRXCK=dev-channel"));
ASSERT_TRUE(WriteFileString(test_dir_ + "/.nodelta", ""));
- OmahaRequestParams out(&mock_system_state_);
+ OmahaRequestParams out(&fake_system_state_);
EXPECT_TRUE(DoTest(&out, "", ""));
EXPECT_FALSE(out.delta_okay());
}
@@ -259,7 +259,7 @@
"CHROMEOS_RELEASE_BOARD=x86-generic\n"
"CHROMEOS_RELEASE_TRACK=beta-channel\n"
"CHROMEOS_AUSERVER=https://www.google.com"));
- OmahaRequestParams out(&mock_system_state_);
+ OmahaRequestParams out(&fake_system_state_);
EXPECT_TRUE(DoTest(&out, "", ""));
EXPECT_EQ("Chrome OS", out.os_platform());
EXPECT_EQ(string("0.2.2.3_") + GetMachineType(), out.os_sp());
@@ -267,7 +267,7 @@
EXPECT_EQ("{87efface-864d-49a5-9bb3-4b050a7c227a}", out.GetAppId());
EXPECT_EQ("0.2.2.3", out.app_version());
EXPECT_EQ("en-US", out.app_lang());
- EXPECT_EQ(mock_system_state_.hardware()->GetHardwareClass(), out.hwid());
+ EXPECT_EQ(fake_system_state_.hardware()->GetHardwareClass(), out.hwid());
EXPECT_FALSE(out.delta_okay());
EXPECT_EQ("beta-channel", out.target_channel());
EXPECT_EQ("https://www.google.com", out.update_url());
@@ -287,12 +287,12 @@
"CHROMEOS_RELEASE_TRACK=stable-channel\n"
"CHROMEOS_AUSERVER=http://www.google.com"));
params_.SetLockDown(true);
- OmahaRequestParams out(&mock_system_state_);
+ OmahaRequestParams out(&fake_system_state_);
EXPECT_TRUE(DoTest(&out, "", ""));
EXPECT_EQ("arm-generic", out.os_board());
EXPECT_EQ("{87efface-864d-49a5-9bb3-4b050a7c227a}", out.GetAppId());
EXPECT_EQ("0.2.2.3", out.app_version());
- EXPECT_EQ(mock_system_state_.hardware()->GetHardwareClass(), out.hwid());
+ EXPECT_EQ(fake_system_state_.hardware()->GetHardwareClass(), out.hwid());
EXPECT_FALSE(out.delta_okay());
EXPECT_EQ("stable-channel", out.target_channel());
EXPECT_EQ("https://www.google.com", out.update_url());
@@ -310,12 +310,12 @@
test_dir_ + kStatefulPartition + "/etc/lsb-release",
"CHROMEOS_RELEASE_BOARD=x86-generic\n"
"CHROMEOS_RELEASE_TRACK=dev-channel"));
- OmahaRequestParams out(&mock_system_state_);
+ OmahaRequestParams out(&fake_system_state_);
EXPECT_TRUE(DoTest(&out, "", ""));
EXPECT_EQ("x86-generic", out.os_board());
EXPECT_EQ("{87efface-864d-49a5-9bb3-4b050a7c227a}", out.GetAppId());
EXPECT_EQ("0.2.2.3", out.app_version());
- EXPECT_EQ(mock_system_state_.hardware()->GetHardwareClass(), out.hwid());
+ EXPECT_EQ(fake_system_state_.hardware()->GetHardwareClass(), out.hwid());
EXPECT_TRUE(out.delta_okay());
EXPECT_EQ("dev-channel", out.target_channel());
EXPECT_EQ("http://www.google.com", out.update_url());
@@ -330,14 +330,14 @@
"CHROMEOS_RELEASE_TRACK=dev-channel\n"
"CHROMEOS_AUSERVER=http://www.google.com"));
{
- OmahaRequestParams params(&mock_system_state_);
+ OmahaRequestParams params(&fake_system_state_);
params.set_root(test_dir_);
params.SetLockDown(false);
EXPECT_TRUE(params.Init("", "", false));
params.SetTargetChannel("canary-channel", false);
EXPECT_FALSE(params.is_powerwash_allowed());
}
- OmahaRequestParams out(&mock_system_state_);
+ OmahaRequestParams out(&fake_system_state_);
EXPECT_TRUE(DoTest(&out, "", ""));
EXPECT_EQ("canary-channel", out.target_channel());
EXPECT_FALSE(out.is_powerwash_allowed());
@@ -352,14 +352,14 @@
"CHROMEOS_RELEASE_TRACK=dev-channel\n"
"CHROMEOS_AUSERVER=http://www.google.com"));
{
- OmahaRequestParams params(&mock_system_state_);
+ OmahaRequestParams params(&fake_system_state_);
params.set_root(test_dir_);
params.SetLockDown(false);
EXPECT_TRUE(params.Init("", "", false));
params.SetTargetChannel("canary-channel", true);
EXPECT_TRUE(params.is_powerwash_allowed());
}
- OmahaRequestParams out(&mock_system_state_);
+ OmahaRequestParams out(&fake_system_state_);
EXPECT_TRUE(DoTest(&out, "", ""));
EXPECT_EQ("canary-channel", out.target_channel());
EXPECT_TRUE(out.is_powerwash_allowed());
@@ -374,14 +374,14 @@
"CHROMEOS_RELEASE_TRACK=dev-channel\n"
"CHROMEOS_AUSERVER=http://www.google.com"));
{
- OmahaRequestParams params(&mock_system_state_);
+ OmahaRequestParams params(&fake_system_state_);
params.set_root(string("./") + test_dir_);
params.SetLockDown(true);
EXPECT_TRUE(params.Init("", "", false));
params.SetTargetChannel("dogfood-channel", true);
EXPECT_FALSE(params.is_powerwash_allowed());
}
- OmahaRequestParams out(&mock_system_state_);
+ OmahaRequestParams out(&fake_system_state_);
EXPECT_TRUE(DoTest(&out, "", ""));
EXPECT_EQ("arm-generic", out.os_board());
EXPECT_EQ("dev-channel", out.target_channel());
@@ -409,7 +409,7 @@
"CHROMEOS_RELEASE_TRACK=dev-channel\n"
"CHROMEOS_AUSERVER=http://www.google.com"));
params_.SetLockDown(true);
- OmahaRequestParams out(&mock_system_state_);
+ OmahaRequestParams out(&fake_system_state_);
EXPECT_TRUE(DoTest(&out, "", ""));
EXPECT_EQ("Chrome OS", out.os_platform());
EXPECT_EQ(string("0.2.2.3_") + GetMachineType(), out.os_sp());
@@ -417,7 +417,7 @@
EXPECT_EQ("{87efface-864d-49a5-9bb3-4b050a7c227a}", out.GetAppId());
EXPECT_EQ("0.2.2.3", out.app_version());
EXPECT_EQ("en-US", out.app_lang());
- EXPECT_EQ(mock_system_state_.hardware()->GetHardwareClass(), out.hwid());
+ EXPECT_EQ(fake_system_state_.hardware()->GetHardwareClass(), out.hwid());
EXPECT_TRUE(out.delta_okay());
EXPECT_EQ("dev-channel", out.target_channel());
EXPECT_EQ("http://www.google.com", out.update_url());
@@ -509,7 +509,7 @@
"CHROMEOS_RELEASE_BOARD=x86-generic\n"
"CHROMEOS_RELEASE_TRACK=stable-channel\n"
"CHROMEOS_AUSERVER=https://www.google.com"));
- OmahaRequestParams out(&mock_system_state_);
+ OmahaRequestParams out(&fake_system_state_);
EXPECT_TRUE(DoTest(&out, "", ""));
EXPECT_EQ("https://www.google.com", out.update_url());
EXPECT_FALSE(out.delta_okay());
@@ -528,7 +528,7 @@
"CHROMEOS_BOARD_APPID=b\n"
"CHROMEOS_CANARY_APPID=c\n"
"CHROMEOS_RELEASE_TRACK=stable-channel\n"));
- OmahaRequestParams out(&mock_system_state_);
+ OmahaRequestParams out(&fake_system_state_);
EXPECT_TRUE(DoTest(&out, "", ""));
EXPECT_EQ("stable-channel", out.download_channel());
EXPECT_EQ("b", out.GetAppId());
@@ -541,7 +541,7 @@
"CHROMEOS_BOARD_APPID=b\n"
"CHROMEOS_CANARY_APPID=c\n"
"CHROMEOS_RELEASE_TRACK=canary-channel\n"));
- OmahaRequestParams out(&mock_system_state_);
+ OmahaRequestParams out(&fake_system_state_);
EXPECT_TRUE(DoTest(&out, "", ""));
EXPECT_EQ("canary-channel", out.download_channel());
EXPECT_EQ("c", out.GetAppId());
@@ -553,7 +553,7 @@
"CHROMEOS_RELEASE_APPID=r\n"
"CHROMEOS_CANARY_APPID=c\n"
"CHROMEOS_RELEASE_TRACK=stable-channel\n"));
- OmahaRequestParams out(&mock_system_state_);
+ OmahaRequestParams out(&fake_system_state_);
EXPECT_TRUE(DoTest(&out, "", ""));
EXPECT_EQ("stable-channel", out.download_channel());
EXPECT_EQ("r", out.GetAppId());
@@ -565,7 +565,7 @@
"CHROMEOS_RELEASE_APPID=r\n"
"CHROMEOS_CANARY_APPID=c\n"
"CHROMEOS_RELEASE_TRACK=stable-channel\n"));
- OmahaRequestParams out(&mock_system_state_);
+ OmahaRequestParams out(&fake_system_state_);
out.hwid_ = string("STUMPY ALEX 12345");
EXPECT_FALSE(out.CollectECFWVersions());
diff --git a/omaha_response_handler_action_unittest.cc b/omaha_response_handler_action_unittest.cc
index 9907ce3..bb35100 100644
--- a/omaha_response_handler_action_unittest.cc
+++ b/omaha_response_handler_action_unittest.cc
@@ -7,8 +7,8 @@
#include <gtest/gtest.h>
#include "update_engine/constants.h"
+#include "update_engine/fake_system_state.h"
#include "update_engine/omaha_response_handler_action.h"
-#include "update_engine/mock_system_state.h"
#include "update_engine/test_utils.h"
#include "update_engine/utils.h"
@@ -22,7 +22,7 @@
public:
// Return true iff the OmahaResponseHandlerAction succeeded.
// If out is non-NULL, it's set w/ the response from the action.
- bool DoTestCommon(MockSystemState* mock_system_state,
+ bool DoTestCommon(FakeSystemState* fake_system_state,
const OmahaResponse& in,
const string& boot_dev,
const string& deadline_file,
@@ -65,7 +65,7 @@
} // namespace {}
bool OmahaResponseHandlerActionTest::DoTestCommon(
- MockSystemState* mock_system_state,
+ FakeSystemState* fake_system_state,
const OmahaResponse& in,
const string& boot_dev,
const string& test_deadline_file,
@@ -77,19 +77,19 @@
ObjectFeederAction<OmahaResponse> feeder_action;
feeder_action.set_obj(in);
if (in.update_exists and in.version != kBadVersion) {
- EXPECT_CALL(*(mock_system_state->mock_prefs()),
+ EXPECT_CALL(*(fake_system_state->mock_prefs()),
SetString(kPrefsUpdateCheckResponseHash, in.hash))
.WillOnce(Return(true));
}
string current_url = in.payload_urls.size() ? in.payload_urls[0] : "";
- EXPECT_CALL(*(mock_system_state->mock_payload_state()), GetCurrentUrl())
+ EXPECT_CALL(*(fake_system_state->mock_payload_state()), GetCurrentUrl())
.WillRepeatedly(Return(current_url));
- EXPECT_CALL(*(mock_system_state->mock_payload_state()), GetRollbackVersion())
+ EXPECT_CALL(*(fake_system_state->mock_payload_state()), GetRollbackVersion())
.WillRepeatedly(Return(kBadVersion));
OmahaResponseHandlerAction response_handler_action(
- mock_system_state,
+ fake_system_state,
(test_deadline_file.empty() ?
OmahaResponseHandlerAction::kDeadlineFile : test_deadline_file));
response_handler_action.set_boot_device(boot_dev);
@@ -112,8 +112,8 @@
const string& boot_dev,
const string& deadline_file,
InstallPlan* out) {
- MockSystemState mock_system_state;
- return DoTestCommon(&mock_system_state, in, boot_dev, deadline_file, out);
+ FakeSystemState fake_system_state;
+ return DoTestCommon(&fake_system_state, in, boot_dev, deadline_file, out);
}
TEST_F(OmahaResponseHandlerActionTest, SimpleTest) {
@@ -299,8 +299,8 @@
"CHROMEOS_IS_POWERWASH_ALLOWED=true\n"
"CHROMEOS_RELEASE_TRACK=stable-channel\n"));
- MockSystemState mock_system_state;
- OmahaRequestParams params(&mock_system_state);
+ FakeSystemState fake_system_state;
+ OmahaRequestParams params(&fake_system_state);
params.set_root(test_dir);
params.SetLockDown(false);
params.Init("1.2.3.4", "", 0);
@@ -309,9 +309,9 @@
EXPECT_TRUE(params.to_more_stable_channel());
EXPECT_TRUE(params.is_powerwash_allowed());
- mock_system_state.set_request_params(¶ms);
+ fake_system_state.set_request_params(¶ms);
InstallPlan install_plan;
- EXPECT_TRUE(DoTestCommon(&mock_system_state, in, "/dev/sda5", "",
+ EXPECT_TRUE(DoTestCommon(&fake_system_state, in, "/dev/sda5", "",
&install_plan));
EXPECT_TRUE(install_plan.powerwash_required);
@@ -342,8 +342,8 @@
test_dir + kStatefulPartition + "/etc/lsb-release",
"CHROMEOS_RELEASE_TRACK=canary-channel\n"));
- MockSystemState mock_system_state;
- OmahaRequestParams params(&mock_system_state);
+ FakeSystemState fake_system_state;
+ OmahaRequestParams params(&fake_system_state);
params.set_root(test_dir);
params.SetLockDown(false);
params.Init("5.6.7.8", "", 0);
@@ -353,9 +353,9 @@
EXPECT_FALSE(params.to_more_stable_channel());
EXPECT_FALSE(params.is_powerwash_allowed());
- mock_system_state.set_request_params(¶ms);
+ fake_system_state.set_request_params(¶ms);
InstallPlan install_plan;
- EXPECT_TRUE(DoTestCommon(&mock_system_state, in, "/dev/sda5", "",
+ EXPECT_TRUE(DoTestCommon(&fake_system_state, in, "/dev/sda5", "",
&install_plan));
EXPECT_FALSE(install_plan.powerwash_required);
@@ -371,11 +371,11 @@
in.hash = "HASHj+";
in.size = 12;
- MockSystemState mock_system_state;
- OmahaRequestParams params(&mock_system_state);
- mock_system_state.set_request_params(¶ms);
+ FakeSystemState fake_system_state;
+ OmahaRequestParams params(&fake_system_state);
+ fake_system_state.set_request_params(¶ms);
- EXPECT_CALL(*mock_system_state.mock_payload_state(),
+ EXPECT_CALL(*fake_system_state.mock_payload_state(),
SetUsingP2PForDownloading(true));
string p2p_url = "http://9.8.7.6/p2p";
@@ -383,7 +383,7 @@
params.set_use_p2p_for_downloading(true);
InstallPlan install_plan;
- EXPECT_TRUE(DoTestCommon(&mock_system_state, in, "/dev/sda5", "",
+ EXPECT_TRUE(DoTestCommon(&fake_system_state, in, "/dev/sda5", "",
&install_plan));
EXPECT_EQ(in.hash, install_plan.payload_hash);
EXPECT_EQ(install_plan.download_url, p2p_url);
diff --git a/payload_state_unittest.cc b/payload_state_unittest.cc
index be00d00..20d321c 100644
--- a/payload_state_unittest.cc
+++ b/payload_state_unittest.cc
@@ -13,7 +13,7 @@
#include "update_engine/constants.h"
#include "update_engine/fake_clock.h"
#include "update_engine/fake_hardware.h"
-#include "update_engine/mock_system_state.h"
+#include "update_engine/fake_system_state.h"
#include "update_engine/omaha_request_action.h"
#include "update_engine/payload_state.h"
#include "update_engine/prefs.h"
@@ -102,8 +102,8 @@
TEST(PayloadStateTest, SetResponseWorksWithEmptyResponse) {
OmahaResponse response;
- MockSystemState mock_system_state;
- NiceMock<PrefsMock>* prefs = mock_system_state.mock_prefs();
+ FakeSystemState fake_system_state;
+ NiceMock<PrefsMock>* prefs = fake_system_state.mock_prefs();
EXPECT_CALL(*prefs, SetInt64(_,_)).Times(AnyNumber());
EXPECT_CALL(*prefs, SetInt64(kPrefsPayloadAttemptNumber, 0))
.Times(AtLeast(1));
@@ -125,7 +125,7 @@
.Times(AtLeast(1));
EXPECT_CALL(*prefs, SetInt64(kPrefsNumReboots, 0)).Times(AtLeast(1));
PayloadState payload_state;
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state));
payload_state.SetResponse(response);
string stored_response_sign = payload_state.GetResponseSignature();
string expected_response_sign = "NumURLs = 0\n"
@@ -150,8 +150,8 @@
response.hash = "hash";
response.metadata_size = 58123;
response.metadata_signature = "msign";
- MockSystemState mock_system_state;
- NiceMock<PrefsMock>* prefs = mock_system_state.mock_prefs();
+ FakeSystemState fake_system_state;
+ NiceMock<PrefsMock>* prefs = fake_system_state.mock_prefs();
EXPECT_CALL(*prefs, SetInt64(_,_)).Times(AnyNumber());
EXPECT_CALL(*prefs, SetInt64(kPrefsPayloadAttemptNumber, 0))
.Times(AtLeast(1));
@@ -176,7 +176,7 @@
EXPECT_CALL(*prefs, SetInt64(kPrefsNumReboots, 0))
.Times(AtLeast(1));
PayloadState payload_state;
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state));
payload_state.SetResponse(response);
string stored_response_sign = payload_state.GetResponseSignature();
string expected_response_sign = "NumURLs = 1\n"
@@ -203,8 +203,8 @@
response.hash = "rhash";
response.metadata_size = 558123;
response.metadata_signature = "metasign";
- MockSystemState mock_system_state;
- NiceMock<PrefsMock>* prefs = mock_system_state.mock_prefs();
+ FakeSystemState fake_system_state;
+ NiceMock<PrefsMock>* prefs = fake_system_state.mock_prefs();
EXPECT_CALL(*prefs, SetInt64(_,_)).Times(AnyNumber());
EXPECT_CALL(*prefs, SetInt64(kPrefsPayloadAttemptNumber, 0))
.Times(AtLeast(1));
@@ -226,7 +226,7 @@
.Times(AtLeast(1));
PayloadState payload_state;
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state));
payload_state.SetResponse(response);
string stored_response_sign = payload_state.GetResponseSignature();
string expected_response_sign = "NumURLs = 2\n"
@@ -248,8 +248,8 @@
TEST(PayloadStateTest, CanAdvanceUrlIndexCorrectly) {
OmahaResponse response;
- MockSystemState mock_system_state;
- NiceMock<PrefsMock>* prefs = mock_system_state.mock_prefs();
+ FakeSystemState fake_system_state;
+ NiceMock<PrefsMock>* prefs = fake_system_state.mock_prefs();
PayloadState payload_state;
EXPECT_CALL(*prefs, SetInt64(_,_)).Times(AnyNumber());
@@ -276,7 +276,7 @@
EXPECT_CALL(*prefs, SetInt64(kPrefsCurrentUrlFailureCount, 0))
.Times(AtLeast(4));
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state));
// This does a SetResponse which causes all the states to be set to 0 for
// the first time.
@@ -302,18 +302,18 @@
TEST(PayloadStateTest, NewResponseResetsPayloadState) {
OmahaResponse response;
- MockSystemState mock_system_state;
+ FakeSystemState fake_system_state;
PayloadState payload_state;
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state));
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(_, _, _, _, _))
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(_, _, _, _, _))
.Times(AnyNumber());
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(_, _, _))
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendEnumToUMA(_, _, _))
.Times(AnyNumber());
// The first response doesn't send an abandoned event.
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
"Installer.UpdatesAbandonedEventCount", 0, _, _, _)).Times(0);
// Set the first response.
@@ -326,7 +326,7 @@
EXPECT_EQ("https://test", payload_state.GetCurrentUrl());
EXPECT_EQ(1, payload_state.GetUrlSwitchCount());
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
"Installer.UpdatesAbandonedEventCount", 1, _, _, _));
// Now, slightly change the response and set it again.
@@ -338,7 +338,7 @@
EXPECT_EQ("https://test", payload_state.GetCurrentUrl());
EXPECT_EQ(1, payload_state.GetUrlSwitchCount());
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
"Installer.UpdatesAbandonedEventCount", 2, _, _, _));
// Return a third different response.
@@ -362,9 +362,9 @@
TEST(PayloadStateTest, AllCountersGetUpdatedProperlyOnErrorCodesAndEvents) {
OmahaResponse response;
PayloadState payload_state;
- MockSystemState mock_system_state;
+ FakeSystemState fake_system_state;
int progress_bytes = 100;
- NiceMock<PrefsMock>* prefs = mock_system_state.mock_prefs();
+ NiceMock<PrefsMock>* prefs = fake_system_state.mock_prefs();
EXPECT_CALL(*prefs, SetInt64(_,_)).Times(AnyNumber());
EXPECT_CALL(*prefs, SetInt64(kPrefsPayloadAttemptNumber, 0))
@@ -411,7 +411,7 @@
EXPECT_CALL(*prefs, SetInt64(kPrefsNumReboots, 0))
.Times(AtLeast(1));
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state));
SetupPayloadStateWith2Urls("Hash5873", true, &payload_state, &response);
EXPECT_EQ(1, payload_state.GetNumResponsesSeen());
@@ -508,8 +508,8 @@
OmahaResponse response;
response.is_delta_payload = false;
PayloadState payload_state;
- MockSystemState mock_system_state;
- NiceMock<PrefsMock>* prefs = mock_system_state.mock_prefs();
+ FakeSystemState fake_system_state;
+ NiceMock<PrefsMock>* prefs = fake_system_state.mock_prefs();
EXPECT_CALL(*prefs, SetInt64(_,_)).Times(AnyNumber());
EXPECT_CALL(*prefs, SetInt64(kPrefsPayloadAttemptNumber, 0))
@@ -530,13 +530,13 @@
EXPECT_CALL(*prefs, SetInt64(kPrefsCurrentUrlFailureCount, 0))
.Times(AtLeast(1));
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state));
SetupPayloadStateWith2Urls("Hash8593", true, &payload_state, &response);
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
"Installer.PayloadAttemptNumber", 1, _, _, _));
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
"Installer.FullPayloadAttemptNumber", 1, _, _, _));
// This should just advance the payload attempt number;
@@ -554,8 +554,8 @@
OmahaResponse response;
response.is_delta_payload = true;
PayloadState payload_state;
- MockSystemState mock_system_state;
- NiceMock<PrefsMock>* prefs = mock_system_state.mock_prefs();
+ FakeSystemState fake_system_state;
+ NiceMock<PrefsMock>* prefs = fake_system_state.mock_prefs();
EXPECT_CALL(*prefs, SetInt64(_,_)).Times(AnyNumber());
EXPECT_CALL(*prefs, SetInt64(kPrefsPayloadAttemptNumber, 0))
@@ -575,14 +575,14 @@
EXPECT_CALL(*prefs, SetInt64(kPrefsCurrentUrlFailureCount, 0))
.Times(AtLeast(1));
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state));
SetupPayloadStateWith2Urls("Hash8593", true, &payload_state, &response);
// Metrics for Full payload attempt number is not sent with Delta payloads.
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
"Installer.PayloadAttemptNumber", 1, _, _, _));
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
"Installer.FullPayloadAttemptNumber", _, _, _, _))
.Times(0);
@@ -600,9 +600,9 @@
TEST(PayloadStateTest, SetResponseResetsInvalidUrlIndex) {
OmahaResponse response;
PayloadState payload_state;
- MockSystemState mock_system_state;
+ FakeSystemState fake_system_state;
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state));
SetupPayloadStateWith2Urls("Hash4427", true, &payload_state, &response);
// Generate enough events to advance URL index, failure count and
@@ -619,8 +619,8 @@
// Now, simulate a corrupted url index on persisted store which gets
// loaded when update_engine restarts. Using a different prefs object
// so as to not bother accounting for the uninteresting calls above.
- MockSystemState mock_system_state2;
- NiceMock<PrefsMock>* prefs2 = mock_system_state2.mock_prefs();
+ FakeSystemState fake_system_state2;
+ NiceMock<PrefsMock>* prefs2 = fake_system_state2.mock_prefs();
EXPECT_CALL(*prefs2, Exists(_)).WillRepeatedly(Return(true));
EXPECT_CALL(*prefs2, GetInt64(_,_)).Times(AtLeast(1));
EXPECT_CALL(*prefs2, GetInt64(kPrefsPayloadAttemptNumber, _))
@@ -638,7 +638,7 @@
// have the same hash as before so as to not trivially reset because the
// response was different. We want to specifically test that even if the
// response is same, we should reset the state if we find it corrupted.
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state2));
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state2));
SetupPayloadStateWith2Urls("Hash4427", true, &payload_state, &response);
// Make sure all counters get reset to 0 because of the corrupted URL index
@@ -654,12 +654,12 @@
OmahaResponse response;
response.is_delta_payload = false;
PayloadState payload_state;
- MockSystemState mock_system_state;
- OmahaRequestParams params(&mock_system_state);
+ FakeSystemState fake_system_state;
+ OmahaRequestParams params(&fake_system_state);
params.Init("", "", true); // is_interactive = True.
- mock_system_state.set_request_params(¶ms);
+ fake_system_state.set_request_params(¶ms);
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state));
SetupPayloadStateWith2Urls("Hash6437", true, &payload_state, &response);
// Simulate two failures (enough to cause payload backoff) and check
@@ -677,12 +677,12 @@
OmahaResponse response;
response.is_delta_payload = false;
PayloadState payload_state;
- MockSystemState mock_system_state;
- OmahaRequestParams params(&mock_system_state);
+ FakeSystemState fake_system_state;
+ OmahaRequestParams params(&fake_system_state);
params.Init("", "", false); // is_interactive = False.
- mock_system_state.set_request_params(¶ms);
+ fake_system_state.set_request_params(¶ms);
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state));
SetupPayloadStateWith2Urls("Hash6437", true, &payload_state, &response);
// Simulate two failures (enough to cause payload backoff) and check
@@ -708,9 +708,9 @@
OmahaResponse response;
response.is_delta_payload = true;
PayloadState payload_state;
- MockSystemState mock_system_state;
+ FakeSystemState fake_system_state;
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state));
SetupPayloadStateWith2Urls("Hash6437", true, &payload_state, &response);
// Simulate a successful download and see that we're ready to download
@@ -753,9 +753,9 @@
OmahaResponse response;
response.is_delta_payload = false;
PayloadState payload_state;
- MockSystemState mock_system_state;
+ FakeSystemState fake_system_state;
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state));
SetupPayloadStateWith2Urls("Hash8939", true, &payload_state, &response);
CheckPayloadBackoffState(&payload_state, 1, TimeDelta::FromDays(1));
@@ -774,9 +774,9 @@
OmahaResponse response;
response.disable_payload_backoff = true;
PayloadState payload_state;
- MockSystemState mock_system_state;
+ FakeSystemState fake_system_state;
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state));
SetupPayloadStateWith2Urls("Hash8939", true, &payload_state, &response);
// Simulate a successful download and see that we are ready to download
@@ -800,11 +800,11 @@
OmahaResponse response;
response.disable_payload_backoff = true;
PayloadState payload_state;
- MockSystemState mock_system_state;
+ FakeSystemState fake_system_state;
int https_total = 0;
int http_total = 0;
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state));
SetupPayloadStateWith2Urls("Hash3286", true, &payload_state, &response);
EXPECT_EQ(1, payload_state.GetNumResponsesSeen());
@@ -884,63 +884,63 @@
EXPECT_EQ(p2p_total,
payload_state.GetTotalBytesDownloaded(kDownloadSourceHttpPeer));
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(_, _, _, _, _))
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(_, _, _, _, _))
.Times(AnyNumber());
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(_, _, _))
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendEnumToUMA(_, _, _))
.Times(AnyNumber());
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
"Installer.SuccessfulMBsDownloadedFromHttpServer",
http_chunk / kNumBytesInOneMiB, _, _, _));
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
"Installer.TotalMBsDownloadedFromHttpServer",
http_total / kNumBytesInOneMiB, _, _, _));
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
"Installer.SuccessfulMBsDownloadedFromHttpsServer",
https_chunk / kNumBytesInOneMiB, _, _, _));
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
"Installer.TotalMBsDownloadedFromHttpsServer",
https_total / kNumBytesInOneMiB, _, _, _));
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
"Installer.SuccessfulMBsDownloadedFromHttpPeer",
p2p_total / kNumBytesInOneMiB, _, _, _));
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
"Installer.TotalMBsDownloadedFromHttpPeer",
p2p_total / kNumBytesInOneMiB, _, _, _));
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
"Installer.UpdateURLSwitches",
3, _, _, _));
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
metrics::kMetricSuccessfulUpdateUrlSwitchCount,
3, _, _, _));
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
"Installer.UpdateDurationMinutes",
_, _, _, _));
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
metrics::kMetricSuccessfulUpdateTotalDurationMinutes,
_, _, _, _));
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
"Installer.UpdateDurationUptimeMinutes",
_, _, _, _));
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
"Installer.DownloadSourcesUsed",
(1 << kDownloadSourceHttpsServer) | (1 << kDownloadSourceHttpServer) |
(1 << kDownloadSourceHttpPeer),
_, _, _));
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
"Installer.DownloadOverheadPercentage", 318, _, _, _));
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
metrics::kMetricSuccessfulUpdateDownloadOverheadPercentage,
314, _, _, _));
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendEnumToUMA(
"Installer.PayloadFormat", kPayloadTypeFull, kNumPayloadTypes));
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendEnumToUMA(
metrics::kMetricAttemptPayloadType, kPayloadTypeFull, kNumPayloadTypes));
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendEnumToUMA(
metrics::kMetricSuccessfulUpdatePayloadType, kPayloadTypeFull,
kNumPayloadTypes));
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
"Installer.AttemptsCount.Total", 1, _, _, _));
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
metrics::kMetricSuccessfulUpdateAttemptCount, 1, _, _, _));
payload_state.UpdateSucceeded();
@@ -960,9 +960,9 @@
TEST(PayloadStateTest, DownloadSourcesUsedIsCorrect) {
OmahaResponse response;
PayloadState payload_state;
- MockSystemState mock_system_state;
+ FakeSystemState fake_system_state;
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state));
SetupPayloadStateWith2Urls("Hash3286", true, &payload_state, &response);
// Simulate progress in order to mark HTTP as one of the sources used.
@@ -976,13 +976,13 @@
payload_state.GetTotalBytesDownloaded(kDownloadSourceHttpServer));
// Check that only HTTP is reported as a download source.
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(_, _, _, _, _))
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(_, _, _, _, _))
.Times(AnyNumber());
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
"Installer.DownloadSourcesUsed",
(1 << kDownloadSourceHttpServer),
_, _, _));
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
metrics::kMetricSuccessfulUpdateDownloadSourcesUsed,
(1 << kDownloadSourceHttpServer),
_, _, _));
@@ -992,10 +992,10 @@
TEST(PayloadStateTest, RestartingUpdateResetsMetrics) {
OmahaResponse response;
- MockSystemState mock_system_state;
+ FakeSystemState fake_system_state;
PayloadState payload_state;
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state));
// Set the first response.
SetupPayloadStateWith2Urls("Hash5823", true, &payload_state, &response);
@@ -1020,24 +1020,24 @@
}
TEST(PayloadStateTest, NumRebootsIncrementsCorrectly) {
- MockSystemState mock_system_state;
+ FakeSystemState fake_system_state;
PayloadState payload_state;
- NiceMock<PrefsMock>* prefs = mock_system_state.mock_prefs();
+ NiceMock<PrefsMock>* prefs = fake_system_state.mock_prefs();
EXPECT_CALL(*prefs, SetInt64(_,_)).Times(AtLeast(0));
EXPECT_CALL(*prefs, SetInt64(kPrefsNumReboots, 1)).Times(AtLeast(1));
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state));
payload_state.UpdateRestarted();
EXPECT_EQ(0, payload_state.GetNumReboots());
- mock_system_state.set_system_rebooted(true);
+ fake_system_state.set_system_rebooted(true);
payload_state.UpdateResumed();
// Num reboots should be incremented because system rebooted detected.
EXPECT_EQ(1, payload_state.GetNumReboots());
- mock_system_state.set_system_rebooted(false);
+ fake_system_state.set_system_rebooted(false);
payload_state.UpdateResumed();
// Num reboots should now be 1 as reboot was not detected.
EXPECT_EQ(1, payload_state.GetNumReboots());
@@ -1048,21 +1048,21 @@
}
TEST(PayloadStateTest, RollbackVersion) {
- MockSystemState mock_system_state;
+ FakeSystemState fake_system_state;
PayloadState payload_state;
NiceMock<PrefsMock>* mock_powerwash_safe_prefs =
- mock_system_state.mock_powerwash_safe_prefs();
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ fake_system_state.mock_powerwash_safe_prefs();
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state));
// Verify pre-conditions are good.
EXPECT_TRUE(payload_state.GetRollbackVersion().empty());
// Mock out the os version and make sure it's blacklisted correctly.
string rollback_version = "2345.0.0";
- OmahaRequestParams params(&mock_system_state);
+ OmahaRequestParams params(&fake_system_state);
params.Init(rollback_version, "", false);
- mock_system_state.set_request_params(¶ms);
+ fake_system_state.set_request_params(¶ms);
EXPECT_CALL(*mock_powerwash_safe_prefs, SetString(kPrefsRollbackVersion,
rollback_version));
@@ -1085,7 +1085,7 @@
TEST(PayloadStateTest, DurationsAreCorrect) {
OmahaResponse response;
PayloadState payload_state;
- MockSystemState mock_system_state;
+ FakeSystemState fake_system_state;
FakeClock fake_clock;
Prefs prefs;
string temp_dir;
@@ -1100,9 +1100,9 @@
&temp_dir));
prefs.Init(base::FilePath(temp_dir));
- mock_system_state.set_clock(&fake_clock);
- mock_system_state.set_prefs(&prefs);
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ fake_system_state.set_clock(&fake_clock);
+ fake_system_state.set_prefs(&prefs);
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state));
// Check that durations are correct for a successful update where
// time has advanced 7 seconds on the wall clock and 4 seconds on
@@ -1132,7 +1132,7 @@
// durations correctly (e.g. they are the same as before).
fake_clock.SetMonotonicTime(Time::FromInternalValue(5000));
PayloadState payload_state2;
- EXPECT_TRUE(payload_state2.Initialize(&mock_system_state));
+ EXPECT_TRUE(payload_state2.Initialize(&fake_system_state));
EXPECT_EQ(payload_state2.GetUpdateDuration().InMicroseconds(), 10000000);
EXPECT_EQ(payload_state2.GetUpdateDurationUptime().InMicroseconds(),10000000);
@@ -1150,7 +1150,7 @@
TEST(PayloadStateTest, RebootAfterSuccessfulUpdateTest) {
OmahaResponse response;
PayloadState payload_state;
- MockSystemState mock_system_state;
+ FakeSystemState fake_system_state;
FakeClock fake_clock;
Prefs prefs;
string temp_dir;
@@ -1164,9 +1164,9 @@
"RebootAfterSuccessfulUpdateTest.XXXXXX", &temp_dir));
prefs.Init(base::FilePath(temp_dir));
- mock_system_state.set_clock(&fake_clock);
- mock_system_state.set_prefs(&prefs);
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ fake_system_state.set_clock(&fake_clock);
+ fake_system_state.set_prefs(&prefs);
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state));
// Make the update succeed.
SetupPayloadStateWith2Urls("Hash8593", true, &payload_state, &response);
@@ -1182,16 +1182,16 @@
fake_clock.SetWallclockTime(Time::FromInternalValue(
500 * Time::kMicrosecondsPerSecond));
PayloadState payload_state2;
- EXPECT_TRUE(payload_state2.Initialize(&mock_system_state));
+ EXPECT_TRUE(payload_state2.Initialize(&fake_system_state));
// Expect 500 - 30 seconds = 470 seconds ~= 7 min 50 sec
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
"Installer.TimeToRebootMinutes",
7, _, _, _));
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
metrics::kMetricTimeToRebootMinutes,
7, _, _, _));
- mock_system_state.set_system_rebooted(true);
+ fake_system_state.set_system_rebooted(true);
payload_state2.UpdateEngineStarted();
@@ -1203,10 +1203,10 @@
TEST(PayloadStateTest, RestartAfterCrash) {
PayloadState payload_state;
- MockSystemState mock_system_state;
- NiceMock<PrefsMock>* prefs = mock_system_state.mock_prefs();
+ FakeSystemState fake_system_state;
+ NiceMock<PrefsMock>* prefs = fake_system_state.mock_prefs();
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state));
// No prefs should be used after a crash.
EXPECT_CALL(*prefs, Exists(_)).Times(0);
@@ -1218,23 +1218,23 @@
EXPECT_CALL(*prefs, GetBoolean(_, _)).Times(0);
// No metrics are reported after a crash.
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(),
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(),
SendToUMA(_, _, _, _, _)).Times(0);
// Simulate an update_engine restart without a reboot.
- mock_system_state.set_system_rebooted(false);
+ fake_system_state.set_system_rebooted(false);
payload_state.UpdateEngineStarted();
}
TEST(PayloadStateTest, CandidateUrlsComputedCorrectly) {
OmahaResponse response;
- MockSystemState mock_system_state;
+ FakeSystemState fake_system_state;
PayloadState payload_state;
policy::MockDevicePolicy disable_http_policy;
- mock_system_state.set_device_policy(&disable_http_policy);
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ fake_system_state.set_device_policy(&disable_http_policy);
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state));
// Test with no device policy. Should default to allowing http.
EXPECT_CALL(disable_http_policy, GetHttpDownloadsEnabled(_))
@@ -1274,7 +1274,7 @@
// Now, pretend that the HTTP policy is turned on. We want to make sure
// the new policy is honored.
policy::MockDevicePolicy enable_http_policy;
- mock_system_state.set_device_policy(&enable_http_policy);
+ fake_system_state.set_device_policy(&enable_http_policy);
EXPECT_CALL(enable_http_policy, GetHttpDownloadsEnabled(_))
.WillRepeatedly(DoAll(SetArgumentPointee<0>(true), Return(true)));
@@ -1300,42 +1300,42 @@
OmahaResponse response;
response.is_delta_payload = true;
PayloadState payload_state;
- MockSystemState mock_system_state;
+ FakeSystemState fake_system_state;
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state));
SetupPayloadStateWith2Urls("Hash6437", true, &payload_state, &response);
// Simulate a successful download and update.
payload_state.DownloadComplete();
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(_, _, _))
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendEnumToUMA(_, _, _))
.Times(AnyNumber());
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendEnumToUMA(
"Installer.PayloadFormat", kPayloadTypeDelta, kNumPayloadTypes));
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendEnumToUMA(
metrics::kMetricAttemptPayloadType, kPayloadTypeDelta, kNumPayloadTypes));
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendEnumToUMA(
metrics::kMetricSuccessfulUpdatePayloadType, kPayloadTypeDelta,
kNumPayloadTypes));
payload_state.UpdateSucceeded();
// Mock the request to a request where the delta was disabled but Omaha sends
// a delta anyway and test again.
- OmahaRequestParams params(&mock_system_state);
+ OmahaRequestParams params(&fake_system_state);
params.set_delta_okay(false);
- mock_system_state.set_request_params(¶ms);
+ fake_system_state.set_request_params(¶ms);
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state));
SetupPayloadStateWith2Urls("Hash6437", true, &payload_state, &response);
payload_state.DownloadComplete();
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendEnumToUMA(
"Installer.PayloadFormat", kPayloadTypeDelta, kNumPayloadTypes));
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendEnumToUMA(
metrics::kMetricAttemptPayloadType, kPayloadTypeDelta,
kNumPayloadTypes));
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendEnumToUMA(
metrics::kMetricSuccessfulUpdatePayloadType, kPayloadTypeDelta,
kNumPayloadTypes));
payload_state.UpdateSucceeded();
@@ -1345,27 +1345,27 @@
OmahaResponse response;
response.is_delta_payload = false;
PayloadState payload_state;
- MockSystemState mock_system_state;
+ FakeSystemState fake_system_state;
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state));
SetupPayloadStateWith2Urls("Hash6437", true, &payload_state, &response);
// Mock the request to a request where the delta was disabled.
- OmahaRequestParams params(&mock_system_state);
+ OmahaRequestParams params(&fake_system_state);
params.set_delta_okay(false);
- mock_system_state.set_request_params(¶ms);
+ fake_system_state.set_request_params(¶ms);
// Simulate a successful download and update.
payload_state.DownloadComplete();
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(_, _, _))
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendEnumToUMA(_, _, _))
.Times(AnyNumber());
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendEnumToUMA(
"Installer.PayloadFormat", kPayloadTypeForcedFull, kNumPayloadTypes));
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendEnumToUMA(
metrics::kMetricAttemptPayloadType, kPayloadTypeForcedFull,
kNumPayloadTypes));
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendEnumToUMA(
metrics::kMetricSuccessfulUpdatePayloadType, kPayloadTypeForcedFull,
kNumPayloadTypes));
payload_state.UpdateSucceeded();
@@ -1375,35 +1375,35 @@
OmahaResponse response;
response.is_delta_payload = false;
PayloadState payload_state;
- MockSystemState mock_system_state;
+ FakeSystemState fake_system_state;
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state));
SetupPayloadStateWith2Urls("Hash6437", true, &payload_state, &response);
// Mock the request to a request where the delta is enabled, although the
// result is full.
- OmahaRequestParams params(&mock_system_state);
+ OmahaRequestParams params(&fake_system_state);
params.set_delta_okay(true);
- mock_system_state.set_request_params(¶ms);
+ fake_system_state.set_request_params(¶ms);
// Simulate a successful download and update.
payload_state.DownloadComplete();
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(_, _, _))
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendEnumToUMA(_, _, _))
.Times(AnyNumber());
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendEnumToUMA(
"Installer.PayloadFormat", kPayloadTypeFull, kNumPayloadTypes));
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendEnumToUMA(
metrics::kMetricAttemptPayloadType, kPayloadTypeFull,
kNumPayloadTypes));
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendEnumToUMA(
metrics::kMetricSuccessfulUpdatePayloadType, kPayloadTypeFull,
kNumPayloadTypes));
payload_state.UpdateSucceeded();
}
TEST(PayloadStateTest, RebootAfterUpdateFailedMetric) {
- MockSystemState mock_system_state;
+ FakeSystemState fake_system_state;
OmahaResponse response;
PayloadState payload_state;
Prefs prefs;
@@ -1413,12 +1413,12 @@
EXPECT_TRUE(utils::MakeTempDirectory("PayloadStateReboot.XXXXXX",
&temp_dir));
prefs.Init(base::FilePath(temp_dir));
- mock_system_state.set_prefs(&prefs);
+ fake_system_state.set_prefs(&prefs);
- FakeHardware* fake_hardware = mock_system_state.fake_hardware();
+ FakeHardware* fake_hardware = fake_system_state.fake_hardware();
fake_hardware->SetBootDevice("/dev/sda3");
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state));
SetupPayloadStateWith2Urls("Hash3141", true, &payload_state, &response);
// Simulate a successful download and update.
@@ -1427,39 +1427,39 @@
payload_state.ExpectRebootInNewVersion("Version:12345678");
// Reboot into the same environment to get an UMA metric with a value of 1.
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
"Installer.RebootToNewPartitionAttempt", 1, _, _, _));
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
metrics::kMetricFailedUpdateCount, 1, _, _, _));
payload_state.ReportFailedBootIfNeeded();
- Mock::VerifyAndClearExpectations(mock_system_state.mock_metrics_lib());
+ Mock::VerifyAndClearExpectations(fake_system_state.mock_metrics_lib());
// Simulate a second update and reboot into the same environment, this should
// send a value of 2.
payload_state.ExpectRebootInNewVersion("Version:12345678");
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
"Installer.RebootToNewPartitionAttempt", 2, _, _, _));
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
metrics::kMetricFailedUpdateCount, 2, _, _, _));
payload_state.ReportFailedBootIfNeeded();
- Mock::VerifyAndClearExpectations(mock_system_state.mock_metrics_lib());
+ Mock::VerifyAndClearExpectations(fake_system_state.mock_metrics_lib());
// Simulate a third failed reboot to new version, but this time for a
// different payload. This should send a value of 1 this time.
payload_state.ExpectRebootInNewVersion("Version:3141592");
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
"Installer.RebootToNewPartitionAttempt", 1, _, _, _));
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
metrics::kMetricFailedUpdateCount, 1, _, _, _));
payload_state.ReportFailedBootIfNeeded();
- Mock::VerifyAndClearExpectations(mock_system_state.mock_metrics_lib());
+ Mock::VerifyAndClearExpectations(fake_system_state.mock_metrics_lib());
EXPECT_TRUE(utils::RecursiveUnlinkDir(temp_dir));
}
TEST(PayloadStateTest, RebootAfterUpdateSucceed) {
- MockSystemState mock_system_state;
+ FakeSystemState fake_system_state;
OmahaResponse response;
PayloadState payload_state;
Prefs prefs;
@@ -1469,12 +1469,12 @@
EXPECT_TRUE(utils::MakeTempDirectory("PayloadStateReboot.XXXXXX",
&temp_dir));
prefs.Init(base::FilePath(temp_dir));
- mock_system_state.set_prefs(&prefs);
+ fake_system_state.set_prefs(&prefs);
- FakeHardware* fake_hardware = mock_system_state.fake_hardware();
+ FakeHardware* fake_hardware = fake_system_state.fake_hardware();
fake_hardware->SetBootDevice("/dev/sda3");
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state));
SetupPayloadStateWith2Urls("Hash3141", true, &payload_state, &response);
// Simulate a successful download and update.
@@ -1485,10 +1485,10 @@
// Change the BootDevice to a different one, no metric should be sent.
fake_hardware->SetBootDevice("/dev/sda5");
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
"Installer.RebootToNewPartitionAttempt", _, _, _, _))
.Times(0);
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
metrics::kMetricFailedUpdateCount, _, _, _, _))
.Times(0);
payload_state.ReportFailedBootIfNeeded();
@@ -1502,7 +1502,7 @@
}
TEST(PayloadStateTest, RebootAfterCanceledUpdate) {
- MockSystemState mock_system_state;
+ FakeSystemState fake_system_state;
OmahaResponse response;
PayloadState payload_state;
Prefs prefs;
@@ -1512,9 +1512,9 @@
EXPECT_TRUE(utils::MakeTempDirectory("PayloadStateReboot.XXXXXX",
&temp_dir));
prefs.Init(base::FilePath(temp_dir));
- mock_system_state.set_prefs(&prefs);
+ fake_system_state.set_prefs(&prefs);
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state));
SetupPayloadStateWith2Urls("Hash3141", true, &payload_state, &response);
// Simulate a successful download and update.
@@ -1522,10 +1522,10 @@
payload_state.UpdateSucceeded();
payload_state.ExpectRebootInNewVersion("Version:12345678");
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
"Installer.RebootToNewPartitionAttempt", _, _, _, _))
.Times(0);
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
metrics::kMetricFailedUpdateCount, _, _, _, _))
.Times(0);
@@ -1539,7 +1539,7 @@
}
TEST(PayloadStateTest, UpdateSuccessWithWipedPrefs) {
- MockSystemState mock_system_state;
+ FakeSystemState fake_system_state;
PayloadState payload_state;
Prefs prefs;
string temp_dir;
@@ -1548,14 +1548,14 @@
EXPECT_TRUE(utils::MakeTempDirectory("PayloadStateReboot.XXXXXX",
&temp_dir));
prefs.Init(base::FilePath(temp_dir));
- mock_system_state.set_prefs(&prefs);
+ fake_system_state.set_prefs(&prefs);
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state));
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
"Installer.RebootToNewPartitionAttempt", _, _, _, _))
.Times(0);
- EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ EXPECT_CALL(*fake_system_state.mock_metrics_lib(), SendToUMA(
metrics::kMetricFailedUpdateCount, _, _, _, _))
.Times(0);
@@ -1568,7 +1568,7 @@
TEST(PayloadStateTest, DisallowP2PAfterTooManyAttempts) {
OmahaResponse response;
PayloadState payload_state;
- MockSystemState mock_system_state;
+ FakeSystemState fake_system_state;
Prefs prefs;
string temp_dir;
@@ -1577,8 +1577,8 @@
&temp_dir));
prefs.Init(base::FilePath(temp_dir));
- mock_system_state.set_prefs(&prefs);
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ fake_system_state.set_prefs(&prefs);
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state));
SetupPayloadStateWith2Urls("Hash8593", true, &payload_state, &response);
// Should allow exactly kMaxP2PAttempts...
@@ -1596,7 +1596,7 @@
TEST(PayloadStateTest, DisallowP2PAfterDeadline) {
OmahaResponse response;
PayloadState payload_state;
- MockSystemState mock_system_state;
+ FakeSystemState fake_system_state;
FakeClock fake_clock;
Prefs prefs;
string temp_dir;
@@ -1606,9 +1606,9 @@
&temp_dir));
prefs.Init(base::FilePath(temp_dir));
- mock_system_state.set_clock(&fake_clock);
- mock_system_state.set_prefs(&prefs);
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ fake_system_state.set_clock(&fake_clock);
+ fake_system_state.set_prefs(&prefs);
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state));
SetupPayloadStateWith2Urls("Hash8593", true, &payload_state, &response);
// Set the clock to 1 second.
@@ -1649,15 +1649,15 @@
TEST(PayloadStateTest, P2PStateVarsInitialValue) {
OmahaResponse response;
PayloadState payload_state;
- MockSystemState mock_system_state;
+ FakeSystemState fake_system_state;
Prefs prefs;
string temp_dir;
EXPECT_TRUE(utils::MakeTempDirectory("PayloadStateP2PTests.XXXXXX",
&temp_dir));
prefs.Init(base::FilePath(temp_dir));
- mock_system_state.set_prefs(&prefs);
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ fake_system_state.set_prefs(&prefs);
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state));
SetupPayloadStateWith2Urls("Hash8593", true, &payload_state, &response);
Time null_time = Time();
@@ -1670,7 +1670,7 @@
TEST(PayloadStateTest, P2PStateVarsArePersisted) {
OmahaResponse response;
PayloadState payload_state;
- MockSystemState mock_system_state;
+ FakeSystemState fake_system_state;
FakeClock fake_clock;
Prefs prefs;
string temp_dir;
@@ -1678,9 +1678,9 @@
EXPECT_TRUE(utils::MakeTempDirectory("PayloadStateP2PTests.XXXXXX",
&temp_dir));
prefs.Init(base::FilePath(temp_dir));
- mock_system_state.set_clock(&fake_clock);
- mock_system_state.set_prefs(&prefs);
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ fake_system_state.set_clock(&fake_clock);
+ fake_system_state.set_prefs(&prefs);
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state));
SetupPayloadStateWith2Urls("Hash8593", true, &payload_state, &response);
// Set the clock to something known.
@@ -1695,7 +1695,7 @@
// Now create a new PayloadState and check that it loads the state
// vars correctly.
PayloadState payload_state2;
- EXPECT_TRUE(payload_state2.Initialize(&mock_system_state));
+ EXPECT_TRUE(payload_state2.Initialize(&fake_system_state));
EXPECT_EQ(1, payload_state2.GetP2PNumAttempts());
EXPECT_EQ(time, payload_state2.GetP2PFirstAttemptTimestamp());
@@ -1705,7 +1705,7 @@
TEST(PayloadStateTest, P2PStateVarsAreClearedOnNewResponse) {
OmahaResponse response;
PayloadState payload_state;
- MockSystemState mock_system_state;
+ FakeSystemState fake_system_state;
FakeClock fake_clock;
Prefs prefs;
string temp_dir;
@@ -1713,9 +1713,9 @@
EXPECT_TRUE(utils::MakeTempDirectory("PayloadStateP2PTests.XXXXXX",
&temp_dir));
prefs.Init(base::FilePath(temp_dir));
- mock_system_state.set_clock(&fake_clock);
- mock_system_state.set_prefs(&prefs);
- EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ fake_system_state.set_clock(&fake_clock);
+ fake_system_state.set_prefs(&prefs);
+ EXPECT_TRUE(payload_state.Initialize(&fake_system_state));
SetupPayloadStateWith2Urls("Hash8593", true, &payload_state, &response);
// Set the clock to something known.
diff --git a/policy_manager/real_updater_provider_unittest.cc b/policy_manager/real_updater_provider_unittest.cc
index 2778c2a..b668900 100644
--- a/policy_manager/real_updater_provider_unittest.cc
+++ b/policy_manager/real_updater_provider_unittest.cc
@@ -12,7 +12,7 @@
#include <gtest/gtest.h>
#include "update_engine/fake_clock.h"
-#include "update_engine/mock_system_state.h"
+#include "update_engine/fake_system_state.h"
#include "update_engine/omaha_request_params.h"
#include "update_engine/policy_manager/pmtest_utils.h"
#include "update_engine/prefs_mock.h"
@@ -21,7 +21,7 @@
using base::Time;
using base::TimeDelta;
using chromeos_update_engine::FakeClock;
-using chromeos_update_engine::MockSystemState;
+using chromeos_update_engine::FakeSystemState;
using chromeos_update_engine::OmahaRequestParams;
using chromeos_update_engine::PrefsMock;
using chromeos_update_engine::UpdateAttempterMock;
@@ -63,8 +63,8 @@
class PmRealUpdaterProviderTest : public ::testing::Test {
protected:
virtual void SetUp() {
- mock_sys_state_.set_clock(&fake_clock_);
- provider_.reset(new RealUpdaterProvider(&mock_sys_state_));
+ fake_sys_state_.set_clock(&fake_clock_);
+ provider_.reset(new RealUpdaterProvider(&fake_sys_state_));
PMTEST_ASSERT_NOT_NULL(provider_.get());
// Check that provider initializes corrrectly.
ASSERT_TRUE(provider_->Init());
@@ -94,11 +94,11 @@
// so |output| is the value being read.
void SetupReadBooleanPref(const char* key, bool key_exists,
bool get_boolean_success, bool output) {
- PrefsMock* const mock_prefs = mock_sys_state_.mock_prefs();
+ PrefsMock* const mock_prefs = fake_sys_state_.mock_prefs();
EXPECT_CALL(*mock_prefs, Exists(StrEq(key))).WillOnce(Return(key_exists));
if (key_exists) {
auto& get_boolean = EXPECT_CALL(
- *mock_sys_state_.mock_prefs(), GetBoolean(StrEq(key), _));
+ *fake_sys_state_.mock_prefs(), GetBoolean(StrEq(key), _));
if (get_boolean_success)
get_boolean.WillOnce(DoAll(SetArgPointee<1>(output), Return(true)));
else
@@ -116,7 +116,7 @@
kUpdateBootTime + kDurationSinceUpdate :
kUpdateBootTime - kDurationSinceUpdate);
const Time kCurrWallclockTime = FixedTime();
- EXPECT_CALL(*mock_sys_state_.mock_update_attempter(),
+ EXPECT_CALL(*fake_sys_state_.mock_update_attempter(),
GetBootTimeAtUpdate(_))
.WillOnce(DoAll(SetArgPointee<0>(kUpdateBootTime), Return(true)));
fake_clock_.SetBootTime(kCurrBootTime);
@@ -125,13 +125,13 @@
}
const TimeDelta default_timeout_ = TimeDelta::FromSeconds(1);
- MockSystemState mock_sys_state_;
+ FakeSystemState fake_sys_state_;
FakeClock fake_clock_;
scoped_ptr<RealUpdaterProvider> provider_;
};
TEST_F(PmRealUpdaterProviderTest, GetLastCheckedTimeOkay) {
- EXPECT_CALL(*mock_sys_state_.mock_update_attempter(),
+ EXPECT_CALL(*fake_sys_state_.mock_update_attempter(),
GetStatus(_, _, _, _, _))
.WillOnce(DoAll(SetArgPointee<0>(FixedTime().ToTimeT()), Return(true)));
TestGetValueOkay(provider_->var_last_checked_time(),
@@ -139,56 +139,56 @@
}
TEST_F(PmRealUpdaterProviderTest, GetLastCheckedTimeFailNoValue) {
- EXPECT_CALL(*mock_sys_state_.mock_update_attempter(),
+ EXPECT_CALL(*fake_sys_state_.mock_update_attempter(),
GetStatus(_, _, _, _, _))
.WillOnce(Return(false));
TestGetValueFail(provider_->var_last_checked_time());
}
TEST_F(PmRealUpdaterProviderTest, GetProgressOkayMin) {
- EXPECT_CALL(*mock_sys_state_.mock_update_attempter(),
+ EXPECT_CALL(*fake_sys_state_.mock_update_attempter(),
GetStatus(_, _, _, _, _))
.WillOnce(DoAll(SetArgPointee<1>(0.0), Return(true)));
TestGetValueOkay(provider_->var_progress(), 0.0);
}
TEST_F(PmRealUpdaterProviderTest, GetProgressOkayMid) {
- EXPECT_CALL(*mock_sys_state_.mock_update_attempter(),
+ EXPECT_CALL(*fake_sys_state_.mock_update_attempter(),
GetStatus(_, _, _, _, _))
.WillOnce(DoAll(SetArgPointee<1>(0.3), Return(true)));
TestGetValueOkay(provider_->var_progress(), 0.3);
}
TEST_F(PmRealUpdaterProviderTest, GetProgressOkayMax) {
- EXPECT_CALL(*mock_sys_state_.mock_update_attempter(),
+ EXPECT_CALL(*fake_sys_state_.mock_update_attempter(),
GetStatus(_, _, _, _, _))
.WillOnce(DoAll(SetArgPointee<1>(1.0), Return(true)));
TestGetValueOkay(provider_->var_progress(), 1.0);
}
TEST_F(PmRealUpdaterProviderTest, GetProgressFailNoValue) {
- EXPECT_CALL(*mock_sys_state_.mock_update_attempter(),
+ EXPECT_CALL(*fake_sys_state_.mock_update_attempter(),
GetStatus(_, _, _, _, _))
.WillOnce(Return(false));
TestGetValueFail(provider_->var_progress());
}
TEST_F(PmRealUpdaterProviderTest, GetProgressFailTooSmall) {
- EXPECT_CALL(*mock_sys_state_.mock_update_attempter(),
+ EXPECT_CALL(*fake_sys_state_.mock_update_attempter(),
GetStatus(_, _, _, _, _))
.WillOnce(DoAll(SetArgPointee<1>(-2.0), Return(true)));
TestGetValueFail(provider_->var_progress());
}
TEST_F(PmRealUpdaterProviderTest, GetProgressFailTooBig) {
- EXPECT_CALL(*mock_sys_state_.mock_update_attempter(),
+ EXPECT_CALL(*fake_sys_state_.mock_update_attempter(),
GetStatus(_, _, _, _, _))
.WillOnce(DoAll(SetArgPointee<1>(2.0), Return(true)));
TestGetValueFail(provider_->var_progress());
}
TEST_F(PmRealUpdaterProviderTest, GetStageOkayIdle) {
- EXPECT_CALL(*mock_sys_state_.mock_update_attempter(),
+ EXPECT_CALL(*fake_sys_state_.mock_update_attempter(),
GetStatus(_, _, _, _, _))
.WillOnce(DoAll(SetArgPointee<2>(update_engine::kUpdateStatusIdle),
Return(true)));
@@ -196,7 +196,7 @@
}
TEST_F(PmRealUpdaterProviderTest, GetStageOkayCheckingForUpdate) {
- EXPECT_CALL(*mock_sys_state_.mock_update_attempter(),
+ EXPECT_CALL(*fake_sys_state_.mock_update_attempter(),
GetStatus(_, _, _, _, _))
.WillOnce(DoAll(
SetArgPointee<2>(update_engine::kUpdateStatusCheckingForUpdate),
@@ -205,7 +205,7 @@
}
TEST_F(PmRealUpdaterProviderTest, GetStageOkayUpdateAvailable) {
- EXPECT_CALL(*mock_sys_state_.mock_update_attempter(),
+ EXPECT_CALL(*fake_sys_state_.mock_update_attempter(),
GetStatus(_, _, _, _, _))
.WillOnce(DoAll(
SetArgPointee<2>(update_engine::kUpdateStatusUpdateAvailable),
@@ -214,7 +214,7 @@
}
TEST_F(PmRealUpdaterProviderTest, GetStageOkayDownloading) {
- EXPECT_CALL(*mock_sys_state_.mock_update_attempter(),
+ EXPECT_CALL(*fake_sys_state_.mock_update_attempter(),
GetStatus(_, _, _, _, _))
.WillOnce(DoAll(SetArgPointee<2>(update_engine::kUpdateStatusDownloading),
Return(true)));
@@ -222,7 +222,7 @@
}
TEST_F(PmRealUpdaterProviderTest, GetStageOkayVerifying) {
- EXPECT_CALL(*mock_sys_state_.mock_update_attempter(),
+ EXPECT_CALL(*fake_sys_state_.mock_update_attempter(),
GetStatus(_, _, _, _, _))
.WillOnce(DoAll(SetArgPointee<2>(update_engine::kUpdateStatusVerifying),
Return(true)));
@@ -230,7 +230,7 @@
}
TEST_F(PmRealUpdaterProviderTest, GetStageOkayFinalizing) {
- EXPECT_CALL(*mock_sys_state_.mock_update_attempter(),
+ EXPECT_CALL(*fake_sys_state_.mock_update_attempter(),
GetStatus(_, _, _, _, _))
.WillOnce(DoAll(SetArgPointee<2>(update_engine::kUpdateStatusFinalizing),
Return(true)));
@@ -238,7 +238,7 @@
}
TEST_F(PmRealUpdaterProviderTest, GetStageOkayUpdatedNeedReboot) {
- EXPECT_CALL(*mock_sys_state_.mock_update_attempter(),
+ EXPECT_CALL(*fake_sys_state_.mock_update_attempter(),
GetStatus(_, _, _, _, _))
.WillOnce(DoAll(
SetArgPointee<2>(update_engine::kUpdateStatusUpdatedNeedReboot),
@@ -247,7 +247,7 @@
}
TEST_F(PmRealUpdaterProviderTest, GetStageOkayReportingErrorEvent) {
- EXPECT_CALL(*mock_sys_state_.mock_update_attempter(),
+ EXPECT_CALL(*fake_sys_state_.mock_update_attempter(),
GetStatus(_, _, _, _, _))
.WillOnce(DoAll(
SetArgPointee<2>(update_engine::kUpdateStatusReportingErrorEvent),
@@ -256,7 +256,7 @@
}
TEST_F(PmRealUpdaterProviderTest, GetStageOkayAttemptingRollback) {
- EXPECT_CALL(*mock_sys_state_.mock_update_attempter(),
+ EXPECT_CALL(*fake_sys_state_.mock_update_attempter(),
GetStatus(_, _, _, _, _))
.WillOnce(DoAll(
SetArgPointee<2>(update_engine::kUpdateStatusAttemptingRollback),
@@ -265,14 +265,14 @@
}
TEST_F(PmRealUpdaterProviderTest, GetStageFailNoValue) {
- EXPECT_CALL(*mock_sys_state_.mock_update_attempter(),
+ EXPECT_CALL(*fake_sys_state_.mock_update_attempter(),
GetStatus(_, _, _, _, _))
.WillOnce(Return(false));
TestGetValueFail(provider_->var_stage());
}
TEST_F(PmRealUpdaterProviderTest, GetStageFailUnknown) {
- EXPECT_CALL(*mock_sys_state_.mock_update_attempter(),
+ EXPECT_CALL(*fake_sys_state_.mock_update_attempter(),
GetStatus(_, _, _, _, _))
.WillOnce(DoAll(SetArgPointee<2>("FooUpdateEngineState"),
Return(true)));
@@ -280,35 +280,35 @@
}
TEST_F(PmRealUpdaterProviderTest, GetStageFailEmpty) {
- EXPECT_CALL(*mock_sys_state_.mock_update_attempter(),
+ EXPECT_CALL(*fake_sys_state_.mock_update_attempter(),
GetStatus(_, _, _, _, _))
.WillOnce(DoAll(SetArgPointee<2>(""), Return(true)));
TestGetValueFail(provider_->var_stage());
}
TEST_F(PmRealUpdaterProviderTest, GetNewVersionOkay) {
- EXPECT_CALL(*mock_sys_state_.mock_update_attempter(),
+ EXPECT_CALL(*fake_sys_state_.mock_update_attempter(),
GetStatus(_, _, _, _, _))
.WillOnce(DoAll(SetArgPointee<3>("1.2.0"), Return(true)));
TestGetValueOkay(provider_->var_new_version(), string("1.2.0"));
}
TEST_F(PmRealUpdaterProviderTest, GetNewVersionFailNoValue) {
- EXPECT_CALL(*mock_sys_state_.mock_update_attempter(),
+ EXPECT_CALL(*fake_sys_state_.mock_update_attempter(),
GetStatus(_, _, _, _, _))
.WillOnce(Return(false));
TestGetValueFail(provider_->var_new_version());
}
TEST_F(PmRealUpdaterProviderTest, GetPayloadSizeOkayZero) {
- EXPECT_CALL(*mock_sys_state_.mock_update_attempter(),
+ EXPECT_CALL(*fake_sys_state_.mock_update_attempter(),
GetStatus(_, _, _, _, _))
.WillOnce(DoAll(SetArgPointee<4>(static_cast<int64_t>(0)), Return(true)));
TestGetValueOkay(provider_->var_payload_size(), static_cast<size_t>(0));
}
TEST_F(PmRealUpdaterProviderTest, GetPayloadSizeOkayArbitrary) {
- EXPECT_CALL(*mock_sys_state_.mock_update_attempter(),
+ EXPECT_CALL(*fake_sys_state_.mock_update_attempter(),
GetStatus(_, _, _, _, _))
.WillOnce(DoAll(SetArgPointee<4>(static_cast<int64_t>(567890)),
Return(true)));
@@ -316,7 +316,7 @@
}
TEST_F(PmRealUpdaterProviderTest, GetPayloadSizeOkayTwoGigabytes) {
- EXPECT_CALL(*mock_sys_state_.mock_update_attempter(),
+ EXPECT_CALL(*fake_sys_state_.mock_update_attempter(),
GetStatus(_, _, _, _, _))
.WillOnce(DoAll(SetArgPointee<4>(static_cast<int64_t>(1) << 31),
Return(true)));
@@ -324,14 +324,14 @@
}
TEST_F(PmRealUpdaterProviderTest, GetPayloadSizeFailNoValue) {
- EXPECT_CALL(*mock_sys_state_.mock_update_attempter(),
+ EXPECT_CALL(*fake_sys_state_.mock_update_attempter(),
GetStatus(_, _, _, _, _))
.WillOnce(Return(false));
TestGetValueFail(provider_->var_payload_size());
}
TEST_F(PmRealUpdaterProviderTest, GetPayloadSizeFailNegative) {
- EXPECT_CALL(*mock_sys_state_.mock_update_attempter(),
+ EXPECT_CALL(*fake_sys_state_.mock_update_attempter(),
GetStatus(_, _, _, _, _))
.WillOnce(DoAll(SetArgPointee<4>(static_cast<int64_t>(-1024)),
Return(true)));
@@ -340,35 +340,35 @@
TEST_F(PmRealUpdaterProviderTest, GetCurrChannelOkay) {
const string kChannelName("foo-channel");
- OmahaRequestParams request_params(&mock_sys_state_);
+ OmahaRequestParams request_params(&fake_sys_state_);
request_params.Init("", "", false);
request_params.set_current_channel(kChannelName);
- mock_sys_state_.set_request_params(&request_params);
+ fake_sys_state_.set_request_params(&request_params);
TestGetValueOkay(provider_->var_curr_channel(), kChannelName);
}
TEST_F(PmRealUpdaterProviderTest, GetCurrChannelFailEmpty) {
- OmahaRequestParams request_params(&mock_sys_state_);
+ OmahaRequestParams request_params(&fake_sys_state_);
request_params.Init("", "", false);
request_params.set_current_channel("");
- mock_sys_state_.set_request_params(&request_params);
+ fake_sys_state_.set_request_params(&request_params);
TestGetValueFail(provider_->var_curr_channel());
}
TEST_F(PmRealUpdaterProviderTest, GetNewChannelOkay) {
const string kChannelName("foo-channel");
- OmahaRequestParams request_params(&mock_sys_state_);
+ OmahaRequestParams request_params(&fake_sys_state_);
request_params.Init("", "", false);
request_params.set_target_channel(kChannelName);
- mock_sys_state_.set_request_params(&request_params);
+ fake_sys_state_.set_request_params(&request_params);
TestGetValueOkay(provider_->var_new_channel(), kChannelName);
}
TEST_F(PmRealUpdaterProviderTest, GetNewChannelFailEmpty) {
- OmahaRequestParams request_params(&mock_sys_state_);
+ OmahaRequestParams request_params(&fake_sys_state_);
request_params.Init("", "", false);
request_params.set_target_channel("");
- mock_sys_state_.set_request_params(&request_params);
+ fake_sys_state_.set_request_params(&request_params);
TestGetValueFail(provider_->var_new_channel());
}
@@ -430,7 +430,7 @@
}
TEST_F(PmRealUpdaterProviderTest, GetUpdateCompletedTimeFailNoValue) {
- EXPECT_CALL(*mock_sys_state_.mock_update_attempter(), GetBootTimeAtUpdate(_))
+ EXPECT_CALL(*fake_sys_state_.mock_update_attempter(), GetBootTimeAtUpdate(_))
.WillOnce(Return(false));
TestGetValueFail(provider_->var_update_completed_time());
}
diff --git a/update_attempter_unittest.cc b/update_attempter_unittest.cc
index 82e96dd..c49cb6f 100644
--- a/update_attempter_unittest.cc
+++ b/update_attempter_unittest.cc
@@ -10,13 +10,13 @@
#include "update_engine/action_mock.h"
#include "update_engine/action_processor_mock.h"
#include "update_engine/fake_clock.h"
+#include "update_engine/fake_system_state.h"
#include "update_engine/filesystem_copier_action.h"
#include "update_engine/install_plan.h"
#include "update_engine/mock_dbus_wrapper.h"
#include "update_engine/mock_http_fetcher.h"
#include "update_engine/mock_p2p_manager.h"
#include "update_engine/mock_payload_state.h"
-#include "update_engine/mock_system_state.h"
#include "update_engine/postinstall_runner_action.h"
#include "update_engine/prefs.h"
#include "update_engine/prefs_mock.h"
@@ -60,12 +60,12 @@
class UpdateAttempterTest : public ::testing::Test {
protected:
UpdateAttempterTest()
- : attempter_(&mock_system_state_, &dbus_),
- mock_connection_manager(&mock_system_state_),
+ : attempter_(&fake_system_state_, &dbus_),
+ mock_connection_manager(&fake_system_state_),
loop_(NULL) {
// Override system state members.
- mock_system_state_.set_connection_manager(&mock_connection_manager);
- mock_system_state_.set_update_attempter(&attempter_);
+ fake_system_state_.set_connection_manager(&mock_connection_manager);
+ fake_system_state_.set_update_attempter(&attempter_);
// Finish initializing the attempter.
attempter_.Init();
@@ -88,7 +88,7 @@
EXPECT_EQ(0, attempter_.new_payload_size_);
processor_ = new NiceMock<ActionProcessorMock>();
attempter_.processor_.reset(processor_); // Transfers ownership.
- prefs_ = mock_system_state_.mock_prefs();
+ prefs_ = fake_system_state_.mock_prefs();
}
virtual void TearDown() {
@@ -150,11 +150,11 @@
void P2PEnabledHousekeepingFailsStart();
static gboolean StaticP2PEnabledHousekeepingFails(gpointer data);
- MockSystemState mock_system_state_;
+ FakeSystemState fake_system_state_;
NiceMock<MockDBusWrapper> dbus_;
UpdateAttempterUnderTest attempter_;
NiceMock<ActionProcessorMock>* processor_;
- NiceMock<PrefsMock>* prefs_; // shortcut to mock_system_state_->mock_prefs()
+ NiceMock<PrefsMock>* prefs_; // shortcut to fake_system_state_->mock_prefs()
NiceMock<MockConnectionManager> mock_connection_manager;
GMainLoop* loop_;
@@ -185,14 +185,14 @@
TEST_F(UpdateAttempterTest, ActionCompletedOmahaRequestTest) {
scoped_ptr<MockHttpFetcher> fetcher(new MockHttpFetcher("", 0, NULL));
fetcher->FailTransfer(500); // Sets the HTTP response code.
- OmahaRequestAction action(&mock_system_state_, NULL,
+ OmahaRequestAction action(&fake_system_state_, NULL,
fetcher.release(), false);
ObjectCollectorAction<OmahaResponse> collector_action;
BondActions(&action, &collector_action);
OmahaResponse response;
response.poll_interval = 234;
action.SetOutputObject(response);
- UpdateCheckScheduler scheduler(&attempter_, &mock_system_state_);
+ UpdateCheckScheduler scheduler(&attempter_, &fake_system_state_);
attempter_.set_update_check_scheduler(&scheduler);
EXPECT_CALL(*prefs_, GetInt64(kPrefsDeltaUpdateFailures, _)).Times(0);
attempter_.ActionCompleted(NULL, &action, kErrorCodeSuccess);
@@ -210,7 +210,7 @@
ScopedPathUnlinker completed_marker_unlinker(test_update_completed_marker);
const base::FilePath marker(test_update_completed_marker);
EXPECT_EQ(0, file_util::WriteFile(marker, "", 0));
- UpdateAttempterUnderTest attempter(&mock_system_state_, &dbus_,
+ UpdateAttempterUnderTest attempter(&fake_system_state_, &dbus_,
test_update_completed_marker);
EXPECT_EQ(UPDATE_STATUS_UPDATED_NEED_REBOOT, attempter.status());
}
@@ -221,17 +221,17 @@
EXPECT_EQ(kErrorCodeSuccess,
GetErrorCodeForAction(NULL, kErrorCodeSuccess));
- MockSystemState mock_system_state;
- OmahaRequestAction omaha_request_action(&mock_system_state, NULL,
+ FakeSystemState fake_system_state;
+ OmahaRequestAction omaha_request_action(&fake_system_state, NULL,
NULL, false);
EXPECT_EQ(kErrorCodeOmahaRequestError,
GetErrorCodeForAction(&omaha_request_action, kErrorCodeError));
- OmahaResponseHandlerAction omaha_response_handler_action(&mock_system_state_);
+ OmahaResponseHandlerAction omaha_response_handler_action(&fake_system_state_);
EXPECT_EQ(kErrorCodeOmahaResponseHandlerError,
GetErrorCodeForAction(&omaha_response_handler_action,
kErrorCodeError));
FilesystemCopierAction filesystem_copier_action(
- &mock_system_state_, false, false);
+ &fake_system_state_, false, false);
EXPECT_EQ(kErrorCodeFilesystemCopierError,
GetErrorCodeForAction(&filesystem_copier_action, kErrorCodeError));
PostinstallRunnerAction postinstall_runner_action;
@@ -289,17 +289,17 @@
TEST_F(UpdateAttempterTest, ScheduleErrorEventActionNoEventTest) {
EXPECT_CALL(*processor_, EnqueueAction(_)).Times(0);
EXPECT_CALL(*processor_, StartProcessing()).Times(0);
- EXPECT_CALL(*mock_system_state_.mock_payload_state(), UpdateFailed(_))
+ EXPECT_CALL(*fake_system_state_.mock_payload_state(), UpdateFailed(_))
.Times(0);
OmahaResponse response;
string url1 = "http://url1";
response.payload_urls.push_back(url1);
response.payload_urls.push_back("https://url");
- EXPECT_CALL(*(mock_system_state_.mock_payload_state()), GetCurrentUrl())
+ EXPECT_CALL(*(fake_system_state_.mock_payload_state()), GetCurrentUrl())
.WillRepeatedly(Return(url1));
- mock_system_state_.mock_payload_state()->SetResponse(response);
+ fake_system_state_.mock_payload_state()->SetResponse(response);
attempter_.ScheduleErrorEventAction();
- EXPECT_EQ(url1, mock_system_state_.mock_payload_state()->GetCurrentUrl());
+ EXPECT_EQ(url1, fake_system_state_.mock_payload_state()->GetCurrentUrl());
}
TEST_F(UpdateAttempterTest, ScheduleErrorEventActionTest) {
@@ -309,7 +309,7 @@
.Times(1);
EXPECT_CALL(*processor_, StartProcessing()).Times(1);
ErrorCode err = kErrorCodeError;
- EXPECT_CALL(*mock_system_state_.mock_payload_state(), UpdateFailed(err));
+ EXPECT_CALL(*fake_system_state_.mock_payload_state(), UpdateFailed(err));
attempter_.error_event_.reset(new OmahaEvent(OmahaEvent::kTypeUpdateComplete,
OmahaEvent::kResultError,
err));
@@ -469,13 +469,13 @@
attempter_.policy_provider_.reset(new policy::PolicyProvider(device_policy));
EXPECT_CALL(*device_policy, LoadPolicy()).WillRepeatedly(Return(true));
- mock_system_state_.set_device_policy(device_policy);
+ fake_system_state_.set_device_policy(device_policy);
if (!valid_slot) {
// References bootable kernels in fake_hardware.h
string rollback_kernel = "/dev/sdz2";
LOG(INFO) << "Test Mark Unbootable: " << rollback_kernel;
- mock_system_state_.fake_hardware()->MarkKernelUnbootable(
+ fake_system_state_.fake_hardware()->MarkKernelUnbootable(
rollback_kernel);
}
@@ -578,7 +578,7 @@
}
TEST_F(UpdateAttempterTest, PingOmahaTest) {
- UpdateCheckScheduler scheduler(&attempter_, &mock_system_state_);
+ UpdateCheckScheduler scheduler(&attempter_, &fake_system_state_);
scheduler.enabled_ = true;
EXPECT_FALSE(scheduler.scheduled_);
attempter_.set_update_check_scheduler(&scheduler);
@@ -604,7 +604,7 @@
TEST_F(UpdateAttempterTest, CreatePendingErrorEventResumedTest) {
OmahaResponseHandlerAction *response_action =
- new OmahaResponseHandlerAction(&mock_system_state_);
+ new OmahaResponseHandlerAction(&fake_system_state_);
response_action->install_plan_.is_resume = true;
attempter_.response_handler_action_.reset(response_action);
ActionMock action;
@@ -633,7 +633,7 @@
attempter_.policy_provider_.reset(new policy::PolicyProvider(device_policy));
EXPECT_CALL(*device_policy, LoadPolicy()).WillRepeatedly(Return(true));
- mock_system_state_.set_device_policy(device_policy);
+ fake_system_state_.set_device_policy(device_policy);
EXPECT_CALL(*device_policy, GetReleaseChannelDelegated(_)).WillRepeatedly(
DoAll(SetArgumentPointee<0>(bool(false)),
@@ -668,7 +668,7 @@
attempter_.policy_provider_.reset(new policy::PolicyProvider(device_policy));
EXPECT_CALL(*device_policy, LoadPolicy()).WillRepeatedly(Return(true));
- mock_system_state_.set_device_policy(device_policy);
+ fake_system_state_.set_device_policy(device_policy);
EXPECT_CALL(*device_policy, GetUpdateDisabled(_))
.WillRepeatedly(DoAll(
@@ -683,7 +683,7 @@
TEST_F(UpdateAttempterTest, P2PNotStartedAtStartupWhenNotEnabled) {
MockP2PManager mock_p2p_manager;
- mock_system_state_.set_p2p_manager(&mock_p2p_manager);
+ fake_system_state_.set_p2p_manager(&mock_p2p_manager);
mock_p2p_manager.fake().SetP2PEnabled(false);
EXPECT_CALL(mock_p2p_manager, EnsureP2PRunning()).Times(0);
attempter_.UpdateEngineStarted();
@@ -691,7 +691,7 @@
TEST_F(UpdateAttempterTest, P2PNotStartedAtStartupWhenEnabledButNotSharing) {
MockP2PManager mock_p2p_manager;
- mock_system_state_.set_p2p_manager(&mock_p2p_manager);
+ fake_system_state_.set_p2p_manager(&mock_p2p_manager);
mock_p2p_manager.fake().SetP2PEnabled(true);
EXPECT_CALL(mock_p2p_manager, EnsureP2PRunning()).Times(0);
attempter_.UpdateEngineStarted();
@@ -699,7 +699,7 @@
TEST_F(UpdateAttempterTest, P2PStartedAtStartupWhenEnabledAndSharing) {
MockP2PManager mock_p2p_manager;
- mock_system_state_.set_p2p_manager(&mock_p2p_manager);
+ fake_system_state_.set_p2p_manager(&mock_p2p_manager);
mock_p2p_manager.fake().SetP2PEnabled(true);
mock_p2p_manager.fake().SetCountSharedFilesResult(1);
EXPECT_CALL(mock_p2p_manager, EnsureP2PRunning()).Times(1);
@@ -722,7 +722,7 @@
// If P2P is not enabled, check that we do not attempt housekeeping
// and do not convey that p2p is to be used.
MockP2PManager mock_p2p_manager;
- mock_system_state_.set_p2p_manager(&mock_p2p_manager);
+ fake_system_state_.set_p2p_manager(&mock_p2p_manager);
mock_p2p_manager.fake().SetP2PEnabled(false);
EXPECT_CALL(mock_p2p_manager, PerformHousekeeping()).Times(0);
attempter_.Update("", "", false, false, false);
@@ -748,7 +748,7 @@
// If p2p is enabled, but starting it fails ensure we don't do
// any housekeeping and do not convey that p2p should be used.
MockP2PManager mock_p2p_manager;
- mock_system_state_.set_p2p_manager(&mock_p2p_manager);
+ fake_system_state_.set_p2p_manager(&mock_p2p_manager);
mock_p2p_manager.fake().SetP2PEnabled(true);
mock_p2p_manager.fake().SetEnsureP2PRunningResult(false);
mock_p2p_manager.fake().SetPerformHousekeepingResult(false);
@@ -776,7 +776,7 @@
// If p2p is enabled, starting it works but housekeeping fails, ensure
// we do not convey p2p is to be used.
MockP2PManager mock_p2p_manager;
- mock_system_state_.set_p2p_manager(&mock_p2p_manager);
+ fake_system_state_.set_p2p_manager(&mock_p2p_manager);
mock_p2p_manager.fake().SetP2PEnabled(true);
mock_p2p_manager.fake().SetEnsureP2PRunningResult(true);
mock_p2p_manager.fake().SetPerformHousekeepingResult(false);
@@ -801,7 +801,7 @@
}
void UpdateAttempterTest::P2PEnabledStart() {
MockP2PManager mock_p2p_manager;
- mock_system_state_.set_p2p_manager(&mock_p2p_manager);
+ fake_system_state_.set_p2p_manager(&mock_p2p_manager);
// If P2P is enabled and starting it works, check that we performed
// housekeeping and that we convey p2p should be used.
mock_p2p_manager.fake().SetP2PEnabled(true);
@@ -828,7 +828,7 @@
}
void UpdateAttempterTest::P2PEnabledInteractiveStart() {
MockP2PManager mock_p2p_manager;
- mock_system_state_.set_p2p_manager(&mock_p2p_manager);
+ fake_system_state_.set_p2p_manager(&mock_p2p_manager);
// For an interactive check, if P2P is enabled and starting it
// works, check that we performed housekeeping and that we convey
// p2p should be used for sharing but NOT for downloading.
@@ -860,7 +860,7 @@
attempter_.policy_provider_.reset(new policy::PolicyProvider(device_policy));
EXPECT_CALL(*device_policy, LoadPolicy()).WillRepeatedly(Return(true));
- mock_system_state_.set_device_policy(device_policy);
+ fake_system_state_.set_device_policy(device_policy);
EXPECT_CALL(*device_policy, GetTargetVersionPrefix(_))
.WillRepeatedly(DoAll(
@@ -892,7 +892,7 @@
attempter_.policy_provider_.reset(new policy::PolicyProvider(device_policy));
EXPECT_CALL(*device_policy, LoadPolicy()).WillRepeatedly(Return(true));
- mock_system_state_.set_device_policy(device_policy);
+ fake_system_state_.set_device_policy(device_policy);
EXPECT_CALL(*device_policy, GetScatterFactorInSeconds(_))
.WillRepeatedly(DoAll(
@@ -920,7 +920,7 @@
Prefs prefs;
attempter_.prefs_ = &prefs;
- mock_system_state_.fake_hardware()->SetIsOOBEComplete(Time::UnixEpoch());
+ fake_system_state_.fake_hardware()->SetIsOOBEComplete(Time::UnixEpoch());
string prefs_dir;
EXPECT_TRUE(utils::MakeTempDirectory("ue_ut_prefs.XXXXXX",
@@ -937,7 +937,7 @@
attempter_.policy_provider_.reset(new policy::PolicyProvider(device_policy));
EXPECT_CALL(*device_policy, LoadPolicy()).WillRepeatedly(Return(true));
- mock_system_state_.set_device_policy(device_policy);
+ fake_system_state_.set_device_policy(device_policy);
EXPECT_CALL(*device_policy, GetScatterFactorInSeconds(_))
.WillRepeatedly(DoAll(
@@ -983,7 +983,7 @@
Prefs prefs;
attempter_.prefs_ = &prefs;
- mock_system_state_.fake_hardware()->SetIsOOBEComplete(Time::UnixEpoch());
+ fake_system_state_.fake_hardware()->SetIsOOBEComplete(Time::UnixEpoch());
string prefs_dir;
EXPECT_TRUE(utils::MakeTempDirectory("ue_ut_prefs.XXXXXX",
@@ -1003,7 +1003,7 @@
attempter_.policy_provider_.reset(new policy::PolicyProvider(device_policy));
EXPECT_CALL(*device_policy, LoadPolicy()).WillRepeatedly(Return(true));
- mock_system_state_.set_device_policy(device_policy);
+ fake_system_state_.set_device_policy(device_policy);
EXPECT_CALL(*device_policy, GetScatterFactorInSeconds(_))
.WillRepeatedly(DoAll(
@@ -1037,8 +1037,8 @@
EXPECT_TRUE(utils::MakeTempDirectory("UpdateCheckScheduler.XXXXXX",
&temp_dir));
prefs.Init(base::FilePath(temp_dir));
- mock_system_state_.set_clock(&fake_clock);
- mock_system_state_.set_prefs(&prefs);
+ fake_system_state_.set_clock(&fake_clock);
+ fake_system_state_.set_prefs(&prefs);
Time epoch = Time::FromInternalValue(0);
fake_clock.SetWallclockTime(epoch);
@@ -1100,12 +1100,12 @@
TEST_F(UpdateAttempterTest, BootTimeInUpdateMarkerFile) {
const string update_completed_marker = test_dir_ + "/update-completed-marker";
- UpdateAttempterUnderTest attempter(&mock_system_state_, &dbus_,
+ UpdateAttempterUnderTest attempter(&fake_system_state_, &dbus_,
update_completed_marker);
FakeClock fake_clock;
fake_clock.SetBootTime(Time::FromTimeT(42));
- mock_system_state_.set_clock(&fake_clock);
+ fake_system_state_.set_clock(&fake_clock);
Time boot_time;
EXPECT_FALSE(attempter.GetBootTimeAtUpdate(&boot_time));
diff --git a/update_check_scheduler_unittest.cc b/update_check_scheduler_unittest.cc
index d4a5a1e..608b6a6 100644
--- a/update_check_scheduler_unittest.cc
+++ b/update_check_scheduler_unittest.cc
@@ -8,7 +8,7 @@
#include "update_engine/certificate_checker.h"
#include "update_engine/certificate_checker_mock.h"
-#include "update_engine/mock_system_state.h"
+#include "update_engine/fake_system_state.h"
#include "update_engine/update_attempter_mock.h"
using base::Time;
@@ -35,21 +35,21 @@
class UpdateCheckSchedulerUnderTest : public UpdateCheckScheduler {
public:
UpdateCheckSchedulerUnderTest(UpdateAttempter* update_attempter,
- MockSystemState* mock_system_state)
- : UpdateCheckScheduler(update_attempter, mock_system_state),
- mock_system_state_(mock_system_state) {}
+ FakeSystemState* fake_system_state)
+ : UpdateCheckScheduler(update_attempter, fake_system_state),
+ fake_system_state_(fake_system_state) {}
MOCK_METHOD2(GTimeoutAddSeconds, guint(guint seconds, GSourceFunc function));
MOCK_METHOD0(IsBootDeviceRemovable, bool());
- MockSystemState* mock_system_state_;
+ FakeSystemState* fake_system_state_;
};
class UpdateCheckSchedulerTest : public ::testing::Test {
public:
UpdateCheckSchedulerTest()
- : attempter_(&mock_system_state_, &dbus_),
- scheduler_(&attempter_, &mock_system_state_) {}
+ : attempter_(&fake_system_state_, &dbus_),
+ scheduler_(&attempter_, &fake_system_state_) {}
protected:
virtual void SetUp() {
@@ -61,7 +61,7 @@
EXPECT_EQ(0, scheduler_.last_interval_);
EXPECT_EQ(0, scheduler_.poll_interval_);
// Make sure singleton CertificateChecker has its members properly setup.
- CertificateChecker::set_system_state(&mock_system_state_);
+ CertificateChecker::set_system_state(&fake_system_state_);
CertificateChecker::set_openssl_wrapper(&openssl_wrapper_);
}
@@ -76,7 +76,7 @@
return test_->source_callback_.Call(data);
}
- MockSystemState mock_system_state_;
+ FakeSystemState fake_system_state_;
MockDBusWrapper dbus_;
OpenSSLWrapperMock openssl_wrapper_;
UpdateAttempterMock attempter_;
@@ -171,7 +171,7 @@
TEST_F(UpdateCheckSchedulerTest, RunBootDeviceRemovableTest) {
scheduler_.enabled_ = true;
- mock_system_state_.fake_hardware()->SetIsOfficialBuild(true);
+ fake_system_state_.fake_hardware()->SetIsOfficialBuild(true);
EXPECT_CALL(scheduler_, IsBootDeviceRemovable())
.Times(1)
.WillOnce(Return(true));
@@ -182,7 +182,7 @@
TEST_F(UpdateCheckSchedulerTest, RunNonOfficialBuildTest) {
scheduler_.enabled_ = true;
- mock_system_state_.fake_hardware()->SetIsOfficialBuild(false);
+ fake_system_state_.fake_hardware()->SetIsOfficialBuild(false);
scheduler_.Run();
EXPECT_FALSE(scheduler_.enabled_);
EXPECT_EQ(NULL, attempter_.update_check_scheduler());
@@ -194,7 +194,7 @@
UpdateCheckScheduler::kTimeoutRegularFuzz,
&interval_min,
&interval_max);
- mock_system_state_.fake_hardware()->SetIsOfficialBuild(true);
+ fake_system_state_.fake_hardware()->SetIsOfficialBuild(true);
EXPECT_CALL(scheduler_, IsBootDeviceRemovable())
.Times(1)
.WillOnce(Return(false));
@@ -280,8 +280,8 @@
TEST_F(UpdateCheckSchedulerTest, StaticCheckOOBECompleteTest) {
scheduler_.scheduled_ = true;
- EXPECT_TRUE(scheduler_.mock_system_state_ != NULL);
- scheduler_.mock_system_state_->fake_hardware()->SetIsOOBEComplete(
+ EXPECT_TRUE(scheduler_.fake_system_state_ != NULL);
+ scheduler_.fake_system_state_->fake_hardware()->SetIsOOBEComplete(
Time::UnixEpoch());
EXPECT_CALL(attempter_, Update("", "", false, false, false))
.Times(1)
@@ -293,7 +293,7 @@
TEST_F(UpdateCheckSchedulerTest, StaticCheckOOBENotCompleteTest) {
scheduler_.scheduled_ = true;
- scheduler_.mock_system_state_->fake_hardware()->UnsetIsOOBEComplete();
+ scheduler_.fake_system_state_->fake_hardware()->UnsetIsOOBEComplete();
EXPECT_CALL(attempter_, Update("", "", _, _, _)).Times(0);
int interval_min, interval_max;
FuzzRange(UpdateCheckScheduler::kTimeoutInitialInterval,
diff --git a/utils_unittest.cc b/utils_unittest.cc
index 84c20cc..77a7d9b 100644
--- a/utils_unittest.cc
+++ b/utils_unittest.cc
@@ -17,7 +17,7 @@
#include <gtest/gtest.h>
#include "update_engine/fake_clock.h"
-#include "update_engine/mock_system_state.h"
+#include "update_engine/fake_system_state.h"
#include "update_engine/prefs.h"
#include "update_engine/test_utils.h"
#include "update_engine/utils.h"
@@ -548,7 +548,7 @@
}
TEST(UtilsTest, WallclockDurationHelper) {
- MockSystemState mock_system_state;
+ FakeSystemState fake_system_state;
FakeClock fake_clock;
base::TimeDelta duration;
string state_variable_key = "test-prefs";
@@ -558,30 +558,30 @@
EXPECT_TRUE(utils::MakeTempDirectory("DurationPrefs.XXXXXX", &temp_dir));
fake_prefs.Init(base::FilePath(temp_dir));
- mock_system_state.set_clock(&fake_clock);
- mock_system_state.set_prefs(&fake_prefs);
+ fake_system_state.set_clock(&fake_clock);
+ fake_system_state.set_prefs(&fake_prefs);
// Initialize wallclock to 1 sec.
fake_clock.SetWallclockTime(base::Time::FromInternalValue(1000000));
// First time called so no previous measurement available.
- EXPECT_FALSE(utils::WallclockDurationHelper(&mock_system_state,
+ EXPECT_FALSE(utils::WallclockDurationHelper(&fake_system_state,
state_variable_key,
&duration));
// Next time, we should get zero since the clock didn't advance.
- EXPECT_TRUE(utils::WallclockDurationHelper(&mock_system_state,
+ EXPECT_TRUE(utils::WallclockDurationHelper(&fake_system_state,
state_variable_key,
&duration));
EXPECT_EQ(duration.InSeconds(), 0);
// We can also call it as many times as we want with it being
// considered a failure.
- EXPECT_TRUE(utils::WallclockDurationHelper(&mock_system_state,
+ EXPECT_TRUE(utils::WallclockDurationHelper(&fake_system_state,
state_variable_key,
&duration));
EXPECT_EQ(duration.InSeconds(), 0);
- EXPECT_TRUE(utils::WallclockDurationHelper(&mock_system_state,
+ EXPECT_TRUE(utils::WallclockDurationHelper(&fake_system_state,
state_variable_key,
&duration));
EXPECT_EQ(duration.InSeconds(), 0);
@@ -589,22 +589,22 @@
// Advance the clock one second, then we should get 1 sec on the
// next call and 0 sec on the subsequent call.
fake_clock.SetWallclockTime(base::Time::FromInternalValue(2000000));
- EXPECT_TRUE(utils::WallclockDurationHelper(&mock_system_state,
+ EXPECT_TRUE(utils::WallclockDurationHelper(&fake_system_state,
state_variable_key,
&duration));
EXPECT_EQ(duration.InSeconds(), 1);
- EXPECT_TRUE(utils::WallclockDurationHelper(&mock_system_state,
+ EXPECT_TRUE(utils::WallclockDurationHelper(&fake_system_state,
state_variable_key,
&duration));
EXPECT_EQ(duration.InSeconds(), 0);
// Advance clock two seconds and we should get 2 sec and then 0 sec.
fake_clock.SetWallclockTime(base::Time::FromInternalValue(4000000));
- EXPECT_TRUE(utils::WallclockDurationHelper(&mock_system_state,
+ EXPECT_TRUE(utils::WallclockDurationHelper(&fake_system_state,
state_variable_key,
&duration));
EXPECT_EQ(duration.InSeconds(), 2);
- EXPECT_TRUE(utils::WallclockDurationHelper(&mock_system_state,
+ EXPECT_TRUE(utils::WallclockDurationHelper(&fake_system_state,
state_variable_key,
&duration));
EXPECT_EQ(duration.InSeconds(), 0);
@@ -613,11 +613,11 @@
// adjustments, for example) so check that we properly handle this
// case.
fake_clock.SetWallclockTime(base::Time::FromInternalValue(3000000));
- EXPECT_FALSE(utils::WallclockDurationHelper(&mock_system_state,
+ EXPECT_FALSE(utils::WallclockDurationHelper(&fake_system_state,
state_variable_key,
&duration));
fake_clock.SetWallclockTime(base::Time::FromInternalValue(4000000));
- EXPECT_TRUE(utils::WallclockDurationHelper(&mock_system_state,
+ EXPECT_TRUE(utils::WallclockDurationHelper(&fake_system_state,
state_variable_key,
&duration));
EXPECT_EQ(duration.InSeconds(), 1);
@@ -627,33 +627,33 @@
TEST(UtilsTest, MonotonicDurationHelper) {
int64_t storage = 0;
- MockSystemState mock_system_state;
+ FakeSystemState fake_system_state;
FakeClock fake_clock;
base::TimeDelta duration;
- mock_system_state.set_clock(&fake_clock);
+ fake_system_state.set_clock(&fake_clock);
// Initialize monotonic clock to 1 sec.
fake_clock.SetMonotonicTime(base::Time::FromInternalValue(1000000));
// First time called so no previous measurement available.
- EXPECT_FALSE(utils::MonotonicDurationHelper(&mock_system_state,
+ EXPECT_FALSE(utils::MonotonicDurationHelper(&fake_system_state,
&storage,
&duration));
// Next time, we should get zero since the clock didn't advance.
- EXPECT_TRUE(utils::MonotonicDurationHelper(&mock_system_state,
+ EXPECT_TRUE(utils::MonotonicDurationHelper(&fake_system_state,
&storage,
&duration));
EXPECT_EQ(duration.InSeconds(), 0);
// We can also call it as many times as we want with it being
// considered a failure.
- EXPECT_TRUE(utils::MonotonicDurationHelper(&mock_system_state,
+ EXPECT_TRUE(utils::MonotonicDurationHelper(&fake_system_state,
&storage,
&duration));
EXPECT_EQ(duration.InSeconds(), 0);
- EXPECT_TRUE(utils::MonotonicDurationHelper(&mock_system_state,
+ EXPECT_TRUE(utils::MonotonicDurationHelper(&fake_system_state,
&storage,
&duration));
EXPECT_EQ(duration.InSeconds(), 0);
@@ -661,22 +661,22 @@
// Advance the clock one second, then we should get 1 sec on the
// next call and 0 sec on the subsequent call.
fake_clock.SetMonotonicTime(base::Time::FromInternalValue(2000000));
- EXPECT_TRUE(utils::MonotonicDurationHelper(&mock_system_state,
+ EXPECT_TRUE(utils::MonotonicDurationHelper(&fake_system_state,
&storage,
&duration));
EXPECT_EQ(duration.InSeconds(), 1);
- EXPECT_TRUE(utils::MonotonicDurationHelper(&mock_system_state,
+ EXPECT_TRUE(utils::MonotonicDurationHelper(&fake_system_state,
&storage,
&duration));
EXPECT_EQ(duration.InSeconds(), 0);
// Advance clock two seconds and we should get 2 sec and then 0 sec.
fake_clock.SetMonotonicTime(base::Time::FromInternalValue(4000000));
- EXPECT_TRUE(utils::MonotonicDurationHelper(&mock_system_state,
+ EXPECT_TRUE(utils::MonotonicDurationHelper(&fake_system_state,
&storage,
&duration));
EXPECT_EQ(duration.InSeconds(), 2);
- EXPECT_TRUE(utils::MonotonicDurationHelper(&mock_system_state,
+ EXPECT_TRUE(utils::MonotonicDurationHelper(&fake_system_state,
&storage,
&duration));
EXPECT_EQ(duration.InSeconds(), 0);