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

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

Issue 133273029: Move LanguageState to the translate component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix more compile issues Created 6 years, 11 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/language_state_unittest.cc
diff --git a/chrome/browser/tab_contents/language_state_unittest.cc b/components/translate/core/browser/language_state_unittest.cc
similarity index 55%
rename from chrome/browser/tab_contents/language_state_unittest.cc
rename to components/translate/core/browser/language_state_unittest.cc
index bdfe613e84a163616cb08bcc8e811cefb6fb9273..8deb60e1be8bdbeee8bd36105aa76ada01091ae0 100644
--- a/chrome/browser/tab_contents/language_state_unittest.cc
+++ b/components/translate/core/browser/language_state_unittest.cc
@@ -2,36 +2,40 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/tab_contents/language_state.h"
+#include "components/translate/core/browser/language_state.h"
#include "base/memory/scoped_ptr.h"
-#include "chrome/browser/tab_contents/language_state_observer.h"
-#include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/test/base/browser_with_test_window_test.h"
-#include "content/public/browser/web_contents.h"
+#include "components/translate/core/browser/translate_driver.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {
-class MockLanguageStateObserver : public LanguageStateObserver {
+class MockTranslateDriver : public TranslateDriver {
public:
- MockLanguageStateObserver()
+ MockTranslateDriver()
: on_is_page_translated_changed_called_(false),
on_translate_enabled_changed_called_(false) {
}
- virtual ~MockLanguageStateObserver() {}
+ void Reset() {
+ on_is_page_translated_changed_called_ = false;
+ on_translate_enabled_changed_called_ = false;
+ }
+
+ virtual ~MockTranslateDriver() {}
- virtual void OnIsPageTranslatedChanged(
- content::WebContents* source) OVERRIDE {
+ virtual void OnIsPageTranslatedChanged() OVERRIDE {
on_is_page_translated_changed_called_ = true;
}
- virtual void OnTranslateEnabledChanged(
- content::WebContents* source) OVERRIDE {
+ virtual void OnTranslateEnabledChanged() OVERRIDE {
on_translate_enabled_changed_called_ = true;
}
+ virtual bool IsLinkNavigation() OVERRIDE {
+ return false;
+ }
+
bool on_is_page_translated_changed_called() const {
return on_is_page_translated_changed_called_;
}
@@ -44,15 +48,15 @@ class MockLanguageStateObserver : public LanguageStateObserver {
bool on_is_page_translated_changed_called_;
bool on_translate_enabled_changed_called_;
- DISALLOW_COPY_AND_ASSIGN(MockLanguageStateObserver);
+ DISALLOW_COPY_AND_ASSIGN(MockTranslateDriver);
};
} // namespace
-typedef BrowserWithTestWindowTest LanguageStateTest;
-
-TEST_F(LanguageStateTest, IsPageTranslated) {
- LanguageState language_state(NULL);
+TEST(LanguageStateTest, IsPageTranslated) {
+ scoped_ptr<MockTranslateDriver> driver(
+ new MockTranslateDriver);
+ LanguageState language_state(driver.get());
EXPECT_FALSE(language_state.IsPageTranslated());
// Navigate to a French page.
@@ -74,44 +78,37 @@ TEST_F(LanguageStateTest, IsPageTranslated) {
EXPECT_FALSE(language_state.IsPageTranslated());
}
-TEST_F(LanguageStateTest, Observer) {
- GURL url("http://foo/");
- AddTab(browser(), url);
- content::NavigationController& navigation_controller =
- browser()->tab_strip_model()->GetWebContentsAt(0)->GetController();
+TEST(LanguageStateTest, Driver) {
- scoped_ptr<MockLanguageStateObserver> observer(
- new MockLanguageStateObserver);
- LanguageState language_state(&navigation_controller);
- language_state.set_observer(observer.get());
+ scoped_ptr<MockTranslateDriver> driver(
+ new MockTranslateDriver);
+ LanguageState language_state(driver.get());
// Enable/Disable translate.
EXPECT_FALSE(language_state.translate_enabled());
- EXPECT_FALSE(observer->on_translate_enabled_changed_called());
+ EXPECT_FALSE(driver->on_translate_enabled_changed_called());
language_state.SetTranslateEnabled(true);
EXPECT_TRUE(language_state.translate_enabled());
- EXPECT_TRUE(observer->on_translate_enabled_changed_called());
+ EXPECT_TRUE(driver->on_translate_enabled_changed_called());
- observer.reset(new MockLanguageStateObserver);
- language_state.set_observer(observer.get());
+ driver->Reset();
language_state.SetTranslateEnabled(false);
EXPECT_FALSE(language_state.translate_enabled());
- EXPECT_TRUE(observer->on_translate_enabled_changed_called());
+ EXPECT_TRUE(driver->on_translate_enabled_changed_called());
// Navigate to a French page.
- observer.reset(new MockLanguageStateObserver);
- language_state.set_observer(observer.get());
+ driver->Reset();
language_state.LanguageDetermined("fr", true);
EXPECT_FALSE(language_state.translate_enabled());
- EXPECT_FALSE(observer->on_is_page_translated_changed_called());
- EXPECT_FALSE(observer->on_translate_enabled_changed_called());
+ EXPECT_FALSE(driver->on_is_page_translated_changed_called());
+ EXPECT_FALSE(driver->on_translate_enabled_changed_called());
// Translate.
language_state.SetCurrentLanguage("en");
EXPECT_TRUE(language_state.IsPageTranslated());
- EXPECT_TRUE(observer->on_is_page_translated_changed_called());
+ EXPECT_TRUE(driver->on_is_page_translated_changed_called());
// Translate feature must be enabled after an actual translation.
EXPECT_TRUE(language_state.translate_enabled());
- EXPECT_TRUE(observer->on_translate_enabled_changed_called());
+ EXPECT_TRUE(driver->on_translate_enabled_changed_called());
}

Powered by Google App Engine
This is Rietveld 408576698