commit 8427b4a6d0e6e02beedbb53798272f8ddc39386f
author Alex Deymo <deymo@chromium.org> Wed Nov 05 14:00:32 2014 -0800
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Thu Nov 06 05:13:47 2014 +0000
tree 62f25ee0e82f44c5ad1f012a870ac55d2dc3b844
parent 2c0db7b68d1f1fa4538b0c34e2fb5c58930ae0c8

update_engine: Standarize mock/fake filenames.

Mock classes implement mostly MOCK_METHOD* methods used with gmock.
Those classes should be named with the prefix "Mock" in the class
name and "mock_" in the header filename.

Fake classes implement a working version of the interface they provide,
often with extra functionality to change their behavior. Those classes
should be prefixed with "Fake" in the class name and "fake_" in the
file name.

Other minor include order fixes are included in this patch.

BUG=None
TEST=Unittest still pass.

Change-Id: I23de7cb11e25182d5855afacca47d431c97b82bb
Reviewed-on: https://chromium-review.googlesource.com/227779
Reviewed-by: Alex Deymo <deymo@chromium.org>
Commit-Queue: Alex Deymo <deymo@chromium.org>
Tested-by: Alex Deymo <deymo@chromium.org>

download_action_unittest.cc

diff --git a/download_action_unittest.cc b/download_action_unittest.cc
index 93a72ae..f241a32 100644
--- a/download_action_unittest.cc
+++ b/download_action_unittest.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "update_engine/download_action.h"
+
 #include <glib.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
@@ -16,12 +18,11 @@
 #include <base/strings/stringprintf.h>
 
 #include "update_engine/action_pipe.h"
-#include "update_engine/download_action.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/mock_prefs.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"
 
@@ -155,7 +156,7 @@
                            "");
   ObjectFeederAction<InstallPlan> feeder_action;
   feeder_action.set_obj(install_plan);
-  PrefsMock prefs;
+  MockPrefs prefs;
   MockHttpFetcher* http_fetcher = new MockHttpFetcher(&data[0],
                                                       data.size(),
                                                       nullptr);
@@ -270,7 +271,7 @@
     InstallPlan install_plan(false, false, "", 0, "", 0, "",
                              temp_file.GetPath(), "", "");
     feeder_action.set_obj(install_plan);
-    PrefsMock prefs;
+    MockPrefs prefs;
     DownloadAction download_action(&prefs, nullptr,
                                    new MockHttpFetcher(&data[0],
                                                        data.size(),
@@ -381,7 +382,7 @@
                            "");
   ObjectFeederAction<InstallPlan> feeder_action;
   feeder_action.set_obj(install_plan);
-  PrefsMock prefs;
+  MockPrefs prefs;
   DownloadAction download_action(&prefs, nullptr,
                                  new MockHttpFetcher("x", 1, nullptr));
   download_action.SetTestFileWriter(&writer);
@@ -416,7 +417,7 @@
   InstallPlan install_plan(false, false, "", 0, "", 0, "", path, "", "");
   ObjectFeederAction<InstallPlan> feeder_action;
   feeder_action.set_obj(install_plan);
-  PrefsMock prefs;
+  MockPrefs prefs;
   DownloadAction download_action(&prefs, nullptr,
                                  new MockHttpFetcher("x", 1, nullptr));
   download_action.SetTestFileWriter(&writer);
@@ -495,7 +496,7 @@
                              "");
     ObjectFeederAction<InstallPlan> feeder_action;
     feeder_action.set_obj(install_plan);
-    PrefsMock prefs;
+    MockPrefs prefs;
     http_fetcher_ = new MockHttpFetcher(data_.c_str(),
                                         data_.length(),
                                         nullptr);