Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(583)

Unified Diff: components/translate/core/browser/translate_manager_unittest.cc

Issue 2906233004: Add translate client mock. (Closed)
Patch Set: fix comments Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/translate/core/browser/translate_manager_unittest.cc
diff --git a/components/translate/core/browser/translate_manager_unittest.cc b/components/translate/core/browser/translate_manager_unittest.cc
index 043e036075e89367fc17ce6bfdb3ce542bd8e6f8..5e6537f1575d853e6005453ab85ad39398513198 100644
--- a/components/translate/core/browser/translate_manager_unittest.cc
+++ b/components/translate/core/browser/translate_manager_unittest.cc
@@ -16,6 +16,7 @@
#include "components/metrics/proto/translate_event.pb.h"
#include "components/pref_registry/pref_registry_syncable.h"
#include "components/sync_preferences/testing_pref_service_syncable.h"
+#include "components/translate/core/browser/mock_translate_client.h"
#include "components/translate/core/browser/mock_translate_driver.h"
#include "components/translate/core/browser/mock_translate_ranker.h"
#include "components/translate/core/browser/translate_browser_metrics.h"
@@ -39,14 +40,6 @@ namespace {
const char kTrialName[] = "MyTrial";
-#if defined(OS_CHROMEOS)
-const char kLanguagePreferredLanguages[] =
- "settings.language.preferred_languages";
-#else
-const char* kLanguagePreferredLanguages = nullptr;
-#endif
-const char kAcceptLanguages[] = "intl.accept_languages";
-
// Overrides NetworkChangeNotifier, simulating connection type changes
// for tests.
// TODO(groby): Combine with similar code in ResourceRequestAllowedNotifierTest.
@@ -87,50 +80,6 @@ class TestNetworkChangeNotifier : public net::NetworkChangeNotifier {
DISALLOW_COPY_AND_ASSIGN(TestNetworkChangeNotifier);
};
-// TODO(groby): Combine with MockTranslateClient in TranslateUiDelegateTest.
-class MockTranslateClient : public TranslateClient {
- public:
- MockTranslateClient(TranslateDriver* driver, PrefService* prefs)
- : driver_(driver), prefs_(prefs) {}
-
- // TODO(groby): Does TranslateClient need a virtual dtor?
- virtual ~MockTranslateClient() {}
-
- TranslateDriver* GetTranslateDriver() { return driver_; }
- PrefService* GetPrefs() { return prefs_; }
-
- std::unique_ptr<TranslatePrefs> GetTranslatePrefs() {
- return base::MakeUnique<TranslatePrefs>(prefs_, kAcceptLanguages,
- kLanguagePreferredLanguages);
- }
- MOCK_METHOD0(GetTranslateAcceptLanguages, TranslateAcceptLanguages*());
- MOCK_CONST_METHOD0(GetInfobarIconID, int());
-
-#if !defined(USE_AURA)
- MOCK_CONST_METHOD1(CreateInfoBarMock,
- infobars::InfoBar*(TranslateInfoBarDelegate*));
- std::unique_ptr<infobars::InfoBar> CreateInfoBar(
- std::unique_ptr<TranslateInfoBarDelegate> delegate) const {
- return base::WrapUnique(CreateInfoBarMock(std::move(delegate).get()));
- }
-#endif
-
- MOCK_METHOD5(ShowTranslateUI,
- void(translate::TranslateStep,
- const std::string&,
- const std::string&,
- TranslateErrors::Type,
- bool));
-
- MOCK_METHOD1(IsTranslatableURL, bool(const GURL&));
- MOCK_METHOD1(ShowReportLanguageDetectionErrorUI,
- void(const GURL& report_url));
-
- private:
- TranslateDriver* driver_;
- PrefService* prefs_;
-};
-
// Compares TranslateEventProto on a restricted set of fields.
MATCHER_P(EqualsTranslateEventProto, translate_event, "") {
const metrics::TranslateEventProto& tep(translate_event);
@@ -147,8 +96,8 @@ class TranslateManagerTest : public ::testing::Test {
protected:
TranslateManagerTest()
: translate_prefs_(&prefs_,
- kAcceptLanguages,
- kLanguagePreferredLanguages),
+ accept_languages_prefs,
+ preferred_languages_prefs),
manager_(TranslateDownloadManager::GetInstance()),
mock_translate_client_(&driver_, &prefs_),
field_trial_list_(new base::FieldTrialList(nullptr)) {}
@@ -156,9 +105,10 @@ class TranslateManagerTest : public ::testing::Test {
void SetUp() override {
// Ensure we're not requesting a server-side translate language list.
TranslateLanguageList::DisableUpdate();
- prefs_.registry()->RegisterStringPref(kAcceptLanguages, std::string());
+ prefs_.registry()->RegisterStringPref(accept_languages_prefs,
+ std::string());
#if defined(OS_CHROMEOS)
- prefs_.registry()->RegisterStringPref(kLanguagePreferredLanguages,
+ prefs_.registry()->RegisterStringPref(preferred_languages_prefs,
std::string());
#endif
TranslatePrefs::RegisterProfilePrefs(prefs_.registry());
@@ -178,7 +128,8 @@ class TranslateManagerTest : public ::testing::Test {
void PrepareTranslateManager() {
TranslateManager::SetIgnoreMissingKeyForTesting(true);
translate_manager_.reset(new translate::TranslateManager(
- &mock_translate_client_, &mock_translate_ranker_, kAcceptLanguages));
+ &mock_translate_client_, &mock_translate_ranker_,
+ accept_languages_prefs));
}
// Prepare the test for ULP related tests.
@@ -275,7 +226,8 @@ class TranslateManagerTest : public ::testing::Test {
TestNetworkChangeNotifier network_notifier_;
translate::testing::MockTranslateDriver driver_;
translate::testing::MockTranslateRanker mock_translate_ranker_;
- ::testing::NiceMock<MockTranslateClient> mock_translate_client_;
+ ::testing::NiceMock<translate::testing::MockTranslateClient>
+ mock_translate_client_;
std::unique_ptr<TranslateManager> translate_manager_;
std::unique_ptr<base::FieldTrialList> field_trial_list_;
base::test::ScopedFeatureList scoped_feature_list_;
@@ -342,7 +294,8 @@ TEST_F(TranslateManagerTest, GetTargetLanguageAcceptLangFallback) {
TEST_F(TranslateManagerTest, DontTranslateOffline) {
TranslateManager::SetIgnoreMissingKeyForTesting(true);
translate_manager_.reset(new translate::TranslateManager(
- &mock_translate_client_, &mock_translate_ranker_, kAcceptLanguages));
+ &mock_translate_client_, &mock_translate_ranker_,
+ accept_languages_prefs));
// The test measures that the "Translate was disabled" exit can only be
// reached after the early-out tests including IsOffline() passed.

Powered by Google App Engine
This is Rietveld 408576698