diff options
Diffstat (limited to 'update_attempter_unittest.cc')
-rw-r--r-- | update_attempter_unittest.cc | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/update_attempter_unittest.cc b/update_attempter_unittest.cc index 579c7368..ec6066ba 100644 --- a/update_attempter_unittest.cc +++ b/update_attempter_unittest.cc @@ -506,7 +506,7 @@ void UpdateAttempterTest::UpdateTestStart() { EXPECT_CALL(*processor_, StartProcessing()); } - attempter_.Update("", "", "", "", false, false, false); + attempter_.Update("", "", "", "", false, 0, false, false); loop_.PostTask(FROM_HERE, base::Bind(&UpdateAttempterTest::UpdateTestVerify, base::Unretained(this))); @@ -706,7 +706,7 @@ void UpdateAttempterTest::P2PNotEnabledStart() { 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); + attempter_.Update("", "", "", "", false, 0, false, false); EXPECT_FALSE(actual_using_p2p_for_downloading_); EXPECT_FALSE(actual_using_p2p_for_sharing()); ScheduleQuitMainLoop(); @@ -728,7 +728,7 @@ void UpdateAttempterTest::P2PEnabledStartingFailsStart() { mock_p2p_manager.fake().SetEnsureP2PRunningResult(false); mock_p2p_manager.fake().SetPerformHousekeepingResult(false); EXPECT_CALL(mock_p2p_manager, PerformHousekeeping()).Times(0); - attempter_.Update("", "", "", "", false, false, false); + attempter_.Update("", "", "", "", false, 0, false, false); EXPECT_FALSE(actual_using_p2p_for_downloading()); EXPECT_FALSE(actual_using_p2p_for_sharing()); ScheduleQuitMainLoop(); @@ -751,7 +751,7 @@ void UpdateAttempterTest::P2PEnabledHousekeepingFailsStart() { mock_p2p_manager.fake().SetEnsureP2PRunningResult(true); mock_p2p_manager.fake().SetPerformHousekeepingResult(false); EXPECT_CALL(mock_p2p_manager, PerformHousekeeping()); - attempter_.Update("", "", "", "", false, false, false); + attempter_.Update("", "", "", "", false, 0, false, false); EXPECT_FALSE(actual_using_p2p_for_downloading()); EXPECT_FALSE(actual_using_p2p_for_sharing()); ScheduleQuitMainLoop(); @@ -773,7 +773,7 @@ void UpdateAttempterTest::P2PEnabledStart() { mock_p2p_manager.fake().SetEnsureP2PRunningResult(true); mock_p2p_manager.fake().SetPerformHousekeepingResult(true); EXPECT_CALL(mock_p2p_manager, PerformHousekeeping()); - attempter_.Update("", "", "", "", false, false, false); + attempter_.Update("", "", "", "", false, 0, false, false); EXPECT_TRUE(actual_using_p2p_for_downloading()); EXPECT_TRUE(actual_using_p2p_for_sharing()); ScheduleQuitMainLoop(); @@ -801,6 +801,7 @@ void UpdateAttempterTest::P2PEnabledInteractiveStart() { "", "", false, + /*rollback_allowed_milestones=*/0, false, /*interactive=*/true); EXPECT_FALSE(actual_using_p2p_for_downloading()); @@ -832,7 +833,7 @@ void UpdateAttempterTest::ReadScatterFactorFromPolicyTestStart() { attempter_.policy_provider_.reset( new policy::PolicyProvider(std::move(device_policy))); - attempter_.Update("", "", "", "", false, false, false); + attempter_.Update("", "", "", "", false, 0, false, false); EXPECT_EQ(scatter_factor_in_seconds, attempter_.scatter_factor_.InSeconds()); ScheduleQuitMainLoop(); @@ -870,7 +871,7 @@ void UpdateAttempterTest::DecrementUpdateCheckCountTestStart() { attempter_.policy_provider_.reset( new policy::PolicyProvider(std::move(device_policy))); - attempter_.Update("", "", "", "", false, false, false); + attempter_.Update("", "", "", "", false, 0, false, false); EXPECT_EQ(scatter_factor_in_seconds, attempter_.scatter_factor_.InSeconds()); // Make sure the file still exists. @@ -886,7 +887,7 @@ void UpdateAttempterTest::DecrementUpdateCheckCountTestStart() { // However, if the count is already 0, it's not decremented. Test that. initial_value = 0; EXPECT_TRUE(fake_prefs.SetInt64(kPrefsUpdateCheckCount, initial_value)); - attempter_.Update("", "", "", "", false, false, false); + attempter_.Update("", "", "", "", false, 0, false, false); EXPECT_TRUE(fake_prefs.Exists(kPrefsUpdateCheckCount)); EXPECT_TRUE(fake_prefs.GetInt64(kPrefsUpdateCheckCount, &new_value)); EXPECT_EQ(initial_value, new_value); @@ -938,6 +939,7 @@ void UpdateAttempterTest::NoScatteringDoneDuringManualUpdateTestStart() { "", "", false, + /*rollback_allowed_milestones=*/0, false, /*interactive=*/true); EXPECT_EQ(scatter_factor_in_seconds, attempter_.scatter_factor_.InSeconds()); @@ -991,7 +993,7 @@ void UpdateAttempterTest::StagingSetsPrefsAndTurnsOffScatteringStart() { FakePrefs fake_prefs; SetUpStagingTest(kValidStagingSchedule, &fake_prefs); - attempter_.Update("", "", "", "", false, false, false); + attempter_.Update("", "", "", "", false, 0, false, false); // Check that prefs have the correct values. int64_t update_count; EXPECT_TRUE(fake_prefs.GetInt64(kPrefsUpdateCheckCount, &update_count)); @@ -1048,7 +1050,7 @@ void UpdateAttempterTest::StagingOffIfInteractiveStart() { FakePrefs fake_prefs; SetUpStagingTest(kValidStagingSchedule, &fake_prefs); - attempter_.Update("", "", "", "", false, false, /* interactive = */ true); + attempter_.Update("", "", "", "", false, 0, false, /* interactive = */ true); CheckStagingOff(); ScheduleQuitMainLoop(); @@ -1068,7 +1070,7 @@ void UpdateAttempterTest::StagingOffIfOobeStart() { FakePrefs fake_prefs; SetUpStagingTest(kValidStagingSchedule, &fake_prefs); - attempter_.Update("", "", "", "", false, false, /* interactive = */ true); + attempter_.Update("", "", "", "", false, 0, false, /* interactive = */ true); CheckStagingOff(); ScheduleQuitMainLoop(); @@ -1238,11 +1240,11 @@ TEST_F(UpdateAttempterTest, UpdateAfterInstall) { } TEST_F(UpdateAttempterTest, TargetVersionPrefixSetAndReset) { - attempter_.CalculateUpdateParams("", "", "", "1234", false, false, false); + attempter_.CalculateUpdateParams("", "", "", "1234", false, 4, false, false); EXPECT_EQ("1234", fake_system_state_.request_params()->target_version_prefix()); - attempter_.CalculateUpdateParams("", "", "", "", false, false, false); + attempter_.CalculateUpdateParams("", "", "", "", false, 4, false, false); EXPECT_TRUE( fake_system_state_.request_params()->target_version_prefix().empty()); } @@ -1253,18 +1255,24 @@ TEST_F(UpdateAttempterTest, RollbackAllowedSetAndReset) { "", "1234", /*rollback_allowed=*/true, + /*rollback_allowed_milestones=*/4, false, false); EXPECT_TRUE(fake_system_state_.request_params()->rollback_allowed()); + EXPECT_EQ(4, + fake_system_state_.request_params()->rollback_allowed_milestones()); attempter_.CalculateUpdateParams("", "", "", "1234", /*rollback_allowed=*/false, + /*rollback_allowed_milestones=*/4, false, false); EXPECT_FALSE(fake_system_state_.request_params()->rollback_allowed()); + EXPECT_EQ(4, + fake_system_state_.request_params()->rollback_allowed_milestones()); } TEST_F(UpdateAttempterTest, UpdateDeferredByPolicyTest) { @@ -1384,7 +1392,7 @@ void UpdateAttempterTest::ResetRollbackHappenedStart(bool is_consumer, SetRollbackHappened(false)) .Times(expected_reset ? 1 : 0); attempter_.policy_provider_ = std::move(mock_policy_provider); - attempter_.Update("", "", "", "", false, false, false); + attempter_.Update("", "", "", "", false, 0, false, false); ScheduleQuitMainLoop(); } |