commit 1f93d098d6d6c341ed7471352fda80c936471a17
author Tianjie Xu <xunchang@google.com> Mon Oct 09 12:13:29 2017 -0700
committer Tianjie Xu <xunchang@google.com> Mon Oct 09 12:41:46 2017 -0700
tree d8144e9e2803eb7899c3aee3a5b4688fa6c0c6f8
parent 1b66114d367d1b85b4397bb559e274dbd0ebcd31

Split the ReportUpdateAttemptMetrics into two functions

Move out the report download metrics into a new function so that
ReportUpdateAttemptMetrics has a reasonable number of parameters.
Create mocks for these two functions also.

Test: unittest pass
Change-Id: Ib9fc33d282a448c7e2d19bb7e7c06619efc2a278

mock_metrics_reporter.h

diff --git a/mock_metrics_reporter.h b/mock_metrics_reporter.h
index 60982a7..a0f164b 100644
--- a/mock_metrics_reporter.h
+++ b/mock_metrics_reporter.h
@@ -23,7 +23,7 @@
 
 namespace chromeos_update_engine {
 
-class MockMetrics : public MetricsReporterInterface {
+class MockMetricsReporter : public MetricsReporterInterface {
  public:
   MOCK_METHOD0(Initialize, void());
 
@@ -37,20 +37,22 @@
                     metrics::CheckReaction reaction,
                     metrics::DownloadErrorCode download_error_code));
 
-  void ReportUpdateAttemptMetrics(
-      SystemState* system_state,
-      int attempt_number,
-      PayloadType payload_type,
-      base::TimeDelta duration,
-      base::TimeDelta duration_uptime,
-      int64_t payload_size,
-      int64_t payload_bytes_downloaded,
-      int64_t payload_download_speed_bps,
-      DownloadSource download_source,
-      metrics::AttemptResult attempt_result,
-      ErrorCode internal_error_code,
-      metrics::DownloadErrorCode payload_download_error_code,
-      metrics::ConnectionType connection_type) override {}
+  MOCK_METHOD8(ReportUpdateAttemptMetrics,
+               void(SystemState* system_state,
+                    int attempt_number,
+                    PayloadType payload_type,
+                    base::TimeDelta duration,
+                    base::TimeDelta duration_uptime,
+                    int64_t payload_size,
+                    metrics::AttemptResult attempt_result,
+                    ErrorCode internal_error_code));
+
+  MOCK_METHOD5(ReportUpdateAttemptDownloadMetrics,
+               void(int64_t payload_bytes_downloaded,
+                    int64_t payload_download_speed_bps,
+                    DownloadSource download_source,
+                    metrics::DownloadErrorCode payload_download_error_code,
+                    metrics::ConnectionType connection_type));
 
   MOCK_METHOD0(ReportAbnormallyTerminatedUpdateAttemptMetrics, void());