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

Unified Diff: chrome/browser/renderer_context_menu/spelling_options_submenu_observer_browsertest.cc

Issue 1647723002: [win/cros/lin] Add back the spellcheck menu. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address Istiaque's comments. Created 4 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: chrome/browser/renderer_context_menu/spelling_options_submenu_observer_browsertest.cc
diff --git a/chrome/browser/renderer_context_menu/spelling_options_submenu_observer_browsertest.cc b/chrome/browser/renderer_context_menu/spelling_options_submenu_observer_browsertest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..ee0fa00bbd6c2f8855d9581abc1ec8ccf7512221
--- /dev/null
+++ b/chrome/browser/renderer_context_menu/spelling_options_submenu_observer_browsertest.cc
@@ -0,0 +1,230 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/renderer_context_menu/spelling_options_submenu_observer.h"
+
+#include "base/prefs/pref_service.h"
+#include "base/strings/utf_string_conversions.h"
+#include "chrome/app/chrome_command_ids.h"
+#include "chrome/browser/renderer_context_menu/render_view_context_menu.h"
+#include "chrome/common/pref_names.h"
+#include "chrome/test/base/in_process_browser_test.h"
+#include "chrome/test/base/testing_profile.h"
+#include "components/renderer_context_menu/render_view_context_menu_observer.h"
+
+using content::RenderViewHost;
+using content::WebContents;
+
+namespace {
+
+// A mock context menu used in this test. This class overrides virtual methods
+// derived from the RenderViewContextMenuProxy class to monitor calls from the
+// SpellingMenuObserver class.
+class MockRenderViewContextMenu : public ui::SimpleMenuModel::Delegate,
groby-ooo-7-16 2016/01/28 22:49:28 That looks somewhat similar to the one in spelling
please use gerrit instead 2016/01/29 20:09:34 Done.
+ public RenderViewContextMenuProxy {
+ public:
+ // A menu item used in this test.
+ struct MockMenuItem {
+ MockMenuItem()
+ : command_id(0),
+ enabled(false),
+ checked(false),
+ hidden(true) {}
+ int command_id;
+ bool enabled;
+ bool checked;
+ bool hidden;
+ base::string16 title;
+ };
+
+ MockRenderViewContextMenu() : observer_(NULL), profile_(new TestingProfile) {}
lazyboy 2016/02/01 19:23:33 Here and in other places: prefer nullptr instead o
+ ~MockRenderViewContextMenu() override {}
+
+ // SimpleMenuModel::Delegate implementation.
+ bool IsCommandIdChecked(int command_id) const override {
+ return observer_->IsCommandIdChecked(command_id);
+ }
+ bool IsCommandIdEnabled(int command_id) const override {
+ return observer_->IsCommandIdEnabled(command_id);
+ }
+ void ExecuteCommand(int command_id, int event_flags) override {
+ observer_->ExecuteCommand(command_id);
+ }
+ void MenuWillShow(ui::SimpleMenuModel* source) override {}
+ void MenuClosed(ui::SimpleMenuModel* source) override {}
+ bool GetAcceleratorForCommandId(int command_id,
+ ui::Accelerator* accelerator) override {
+ return false;
+ }
+
+ // RenderViewContextMenuProxy implementation.
+ void AddMenuItem(int command_id, const base::string16& title) override {}
+ void AddCheckItem(int command_id, const base::string16& title) override {}
+ void AddSeparator() override {}
+ void AddSubMenu(int command_id,
+ const base::string16& label,
+ ui::MenuModel* model) override {}
+ void UpdateMenuItem(int command_id,
+ bool enabled,
+ bool hidden,
+ const base::string16& title) override {}
+ RenderViewHost* GetRenderViewHost() const override { return NULL; }
+ content::BrowserContext* GetBrowserContext() const override {
+ return profile_.get();
+ }
+ content::WebContents* GetWebContents() const override { return NULL; }
+
+ // Attaches a RenderViewContextMenuObserver to be tested.
+ void SetObserver(RenderViewContextMenuObserver* observer) {
+ observer_ = observer;
+ }
+
+ // Returns the number of items added by the test.
+ size_t GetMenuSize() const {
+ return 0;
+ }
+
+ // Returns the i-th item.
+ bool GetMenuItem(size_t i, MockMenuItem* item) const {
+ return false;
+ }
+
+ // Returns the writable profile used in this test.
+ PrefService* GetPrefs() {
+ return profile_->GetPrefs();
+ }
+
+ private:
+ // An observer used for initializing the status of menu items added in this
+ // test. This is a weak pointer, the test is responsible for deleting this
+ // object.
+ RenderViewContextMenuObserver* observer_;
+
+ // A dummy profile used in this test. Call GetPrefs() when a test needs to
+ // change this profile and use PrefService methods.
+ scoped_ptr<TestingProfile> profile_;
+
+ DISALLOW_COPY_AND_ASSIGN(MockRenderViewContextMenu);
+};
+
+// A test class used in this file. This test should be a browser test because it
+// accesses resources.
+class SpellingOptionsSubMenuObserverTest : public InProcessBrowserTest {
+ public:
+ SpellingOptionsSubMenuObserverTest() {}
+ ~SpellingOptionsSubMenuObserverTest() override {}
+
+ void SetUpOnMainThread() override {
+ menu_.reset(new MockRenderViewContextMenu);
+ observer_.reset(
+ new SpellingOptionsSubMenuObserver(menu_.get(), menu_.get(), 1));
+ menu_->SetObserver(observer_.get());
+ }
+
+ void TearDownOnMainThread() override {
+ menu_->SetObserver(nullptr);
+ observer_.reset();
+ menu_.reset();
+ }
+
+ void InitMenu(bool enable_spellcheck,
+ const std::string& accept_languages,
+ const std::vector<std::string>& dictionaries) {
+ menu()->GetPrefs()->SetBoolean(prefs::kEnableContinuousSpellcheck,
+ enable_spellcheck);
+ menu()->GetPrefs()->SetString(prefs::kAcceptLanguages, accept_languages);
+ base::ListValue dictionaries_value;
+ for (const auto& dict : dictionaries) {
+ dictionaries_value.AppendString(dict);
+ }
+ menu()->GetPrefs()->Set(prefs::kSpellCheckDictionaries, dictionaries_value);
+ observer()->InitMenu(content::ContextMenuParams());
+ }
+
+ void ExpectPreferences(bool spellcheck_enabled,
+ const std::vector<std::string>& dictionaries) {
+ EXPECT_EQ(spellcheck_enabled, menu()->GetPrefs()->GetBoolean(
+ prefs::kEnableContinuousSpellcheck));
+ base::ListValue dictionaries_value;
+ for (const auto& dict : dictionaries) {
groby-ooo-7-16 2016/01/28 22:49:28 Why not AppendStrings(dictionaries) ?
please use gerrit instead 2016/01/29 20:09:34 Done.
+ dictionaries_value.AppendString(dict);
+ }
+ EXPECT_TRUE(dictionaries_value.Equals(
+ menu()->GetPrefs()->GetList(prefs::kSpellCheckDictionaries)));
+ }
+
+ MockRenderViewContextMenu* menu() { return menu_.get(); }
+ SpellingOptionsSubMenuObserver* observer() { return observer_.get(); }
+
+ private:
+ scoped_ptr<MockRenderViewContextMenu> menu_;
+ scoped_ptr<SpellingOptionsSubMenuObserver> observer_;
+
+ DISALLOW_COPY_AND_ASSIGN(SpellingOptionsSubMenuObserverTest);
+};
+
+} // namespace
+
+// Tests that selecting the "Check Spelling While Typing" item toggles the value
+// of the "browser.enable_spellchecking" profile.
+IN_PROC_BROWSER_TEST_F(SpellingOptionsSubMenuObserverTest, ToggleSpelling) {
+ InitMenu(true, "en-US", {"en-US"});
+
+ // Verify this menu has the "Check Spelling While Typing" item and this item
+ // is checked.
+ EXPECT_TRUE(menu()->IsCommandIdEnabled(IDC_CHECK_SPELLING_WHILE_TYPING));
+ EXPECT_TRUE(menu()->IsCommandIdChecked(IDC_CHECK_SPELLING_WHILE_TYPING));
+
+ // Select this item and verify that the "Check Spelling While Typing" item is
+ // not checked. Also, verify that the value of "browser.enable_spellchecking"
+ // is now false.
+ menu()->ExecuteCommand(IDC_CHECK_SPELLING_WHILE_TYPING, 0);
+ ExpectPreferences(false, {"en-US"});
+ EXPECT_FALSE(menu()->IsCommandIdChecked(IDC_CHECK_SPELLING_WHILE_TYPING));
+}
+
+// Single accept language is selected based on the dictionaries preference.
+// Consequently selecting multilingual spellcheck should copy all accept
+// languages into spellcheck dictionaries preference.
+IN_PROC_BROWSER_TEST_F(SpellingOptionsSubMenuObserverTest, SelectMultilingual) {
+ InitMenu(true, "en-US,es", {"en-US"});
+ EXPECT_FALSE(menu()->IsCommandIdChecked(IDC_SPELLCHECK_MULTI_LINGUAL));
+ EXPECT_TRUE(menu()->IsCommandIdChecked(IDC_SPELLCHECK_LANGUAGES_FIRST));
+ EXPECT_FALSE(menu()->IsCommandIdChecked(IDC_SPELLCHECK_LANGUAGES_FIRST + 1));
+
+ menu()->ExecuteCommand(IDC_SPELLCHECK_MULTI_LINGUAL, 0);
+ ExpectPreferences(true, {"en-US", "es"});
+}
+
+// Multilingual spellcheck is selected when all dictionaries are used for
+// spellcheck. Consequently selecting "English (United States)" should set
+// spellcheck dictionaries preferences to ["en-US"].
+IN_PROC_BROWSER_TEST_F(SpellingOptionsSubMenuObserverTest,
+ SelectFirstLanguage) {
+ InitMenu(true, "en-US,es", {"en-US", "es"});
+ EXPECT_TRUE(menu()->IsCommandIdChecked(IDC_SPELLCHECK_MULTI_LINGUAL));
+ EXPECT_FALSE(menu()->IsCommandIdChecked(IDC_SPELLCHECK_LANGUAGES_FIRST));
+ EXPECT_FALSE(menu()->IsCommandIdChecked(IDC_SPELLCHECK_LANGUAGES_FIRST + 1));
+
+ menu()->ExecuteCommand(IDC_SPELLCHECK_LANGUAGES_FIRST, 0);
+ ExpectPreferences(true, {"en-US"});
+}
+
+// Single dictionary should be selected based on preferences.
+IN_PROC_BROWSER_TEST_F(SpellingOptionsSubMenuObserverTest,
+ SingleLanguageSelected) {
+ InitMenu(true, "en-US", {"en-US"});
+ EXPECT_TRUE(menu()->IsCommandIdChecked(IDC_SPELLCHECK_LANGUAGES_FIRST));
+}
+
+// Single dictionary should be deselected based on preferences. Selecting the
+// dictionary should update the preference.
+IN_PROC_BROWSER_TEST_F(SpellingOptionsSubMenuObserverTest,
+ SelectTheOnlyLanguage) {
+ InitMenu(true, "en-US", std::vector<std::string>());
+ EXPECT_FALSE(menu()->IsCommandIdChecked(IDC_SPELLCHECK_LANGUAGES_FIRST));
+
+ menu()->ExecuteCommand(IDC_SPELLCHECK_LANGUAGES_FIRST, 0);
+ ExpectPreferences(true, {"en-US"});
please use gerrit instead 2016/01/29 20:09:34 Removed use of initializer lists, which are not al
+}

Powered by Google App Engine
This is Rietveld 408576698