Fix/extend unit test related functionality.
* Adds mock methods to UpdateAttempterMock and turning corresponding
base methods into a virtual (needed for subsequent unit testing).
* Adds a setter to OmahaRequestParams.
* Limited general cleanup.
BUG=chromium:346914
TEST=Unit tests.
Change-Id: I0519ad5c43ddebabc1aff6585cf43a290a2081dc
Reviewed-on: https://chromium-review.googlesource.com/192660
Reviewed-by: Alex Deymo <[email protected]>
Commit-Queue: Gilad Arnold <[email protected]>
Tested-by: Gilad Arnold <[email protected]>
diff --git a/update_attempter_mock.h b/update_attempter_mock.h
index af1b7c1..29e46bc 100644
--- a/update_attempter_mock.h
+++ b/update_attempter_mock.h
@@ -5,27 +5,29 @@
#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_UPDATE_ATTEMPTER_MOCK_H_
#define CHROMEOS_PLATFORM_UPDATE_ENGINE_UPDATE_ATTEMPTER_MOCK_H_
-#include <gmock/gmock.h>
-
-#include "update_engine/mock_dbus_wrapper.h"
-#include "update_engine/mock_system_state.h"
#include "update_engine/update_attempter.h"
+#include <gmock/gmock.h>
+
namespace chromeos_update_engine {
-class MockSystemState;
-
class UpdateAttempterMock : public UpdateAttempter {
public:
- explicit UpdateAttempterMock(MockSystemState* mock_system_state,
- MockDBusWrapper* dbus)
- : UpdateAttempter(mock_system_state, dbus) {}
+ using UpdateAttempter::UpdateAttempter;
MOCK_METHOD5(Update, void(const std::string& app_version,
const std::string& omaha_url,
bool obey_proxies,
bool interactive,
bool is_test));
+
+ MOCK_METHOD5(GetStatus, bool(int64_t* last_checked_time,
+ double* progress,
+ std::string* current_operation,
+ std::string* new_version,
+ int64_t* new_size));
+
+ MOCK_METHOD1(GetBootTimeAtUpdate, bool(base::Time* out_boot_time));
};
} // namespace chromeos_update_engine
