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

Unified Diff: chrome/browser/chromeos/input_method/input_method_manager_browsertest.cc

Issue 9999018: chrome/browser/chromeos/input_method/ refactoring [part 6 of 6] (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 8 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/chromeos/input_method/input_method_manager_browsertest.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_manager_browsertest.cc b/chrome/browser/chromeos/input_method/input_method_manager_browsertest.cc
deleted file mode 100644
index 85363d520a3cbb215dec1dd99c50b75394741adc..0000000000000000000000000000000000000000
--- a/chrome/browser/chromeos/input_method/input_method_manager_browsertest.cc
+++ /dev/null
@@ -1,141 +0,0 @@
-// Copyright (c) 2012 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/chromeos/input_method/input_method_manager.h"
-
-#include "chrome/test/base/in_process_browser_test.h"
-#include "ui/base/accelerators/accelerator.h"
-#include "ui/base/keycodes/keyboard_codes.h"
-
-namespace chromeos {
-namespace input_method {
-
-class InputMethodManagerTest : public InProcessBrowserTest {
- public:
- InputMethodManagerTest() : manager_(InputMethodManager::GetInstance()) {}
-
- protected:
- virtual void SetUpOnMainThread() OVERRIDE {
- manager_->SetEnableAutoImeShutdown(true);
- }
- virtual void CleanUpOnMainThread() OVERRIDE {
- manager_->EnableLayouts("en-US", "xkb:us::eng");
- manager_->StopInputMethodDaemon();
- }
-
- InputMethodManager* manager_;
-
- DISALLOW_COPY_AND_ASSIGN(InputMethodManagerTest);
-};
-
-IN_PROC_BROWSER_TEST_F(InputMethodManagerTest, TestEnableLayouts) {
- // Currently 5 keyboard layouts are supported for en-US, and 1 for ja. See
- // ibus_input_method.txt.
- manager_->EnableLayouts("en-US", "");
- EXPECT_EQ(5U, manager_->GetNumActiveInputMethods());
- // The hardware keyboard layout "xkb:us::eng" is always active, hence 2U.
- manager_->EnableLayouts("ja", "");
- EXPECT_EQ(2U, manager_->GetNumActiveInputMethods());
-}
-
-IN_PROC_BROWSER_TEST_F(InputMethodManagerTest, TestNextInputMethod) {
- manager_->EnableLayouts("en-US", "xkb:us::eng");
- EXPECT_EQ(5U, manager_->GetNumActiveInputMethods());
- EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
- manager_->SwitchToNextInputMethod();
- EXPECT_EQ("xkb:us:intl:eng", manager_->GetCurrentInputMethod().id());
- manager_->SwitchToNextInputMethod();
- EXPECT_EQ("xkb:us:altgr-intl:eng", manager_->GetCurrentInputMethod().id());
- manager_->SwitchToNextInputMethod();
- EXPECT_EQ("xkb:us:dvorak:eng", manager_->GetCurrentInputMethod().id());
- manager_->SwitchToNextInputMethod();
- EXPECT_EQ("xkb:us:colemak:eng", manager_->GetCurrentInputMethod().id());
- manager_->SwitchToNextInputMethod();
- EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
-}
-
-IN_PROC_BROWSER_TEST_F(InputMethodManagerTest, TestPreviousInputMethod) {
- manager_->EnableLayouts("en-US", "xkb:us::eng");
- EXPECT_EQ(5U, manager_->GetNumActiveInputMethods());
- EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
- manager_->SwitchToNextInputMethod();
- EXPECT_EQ("xkb:us:intl:eng", manager_->GetCurrentInputMethod().id());
- manager_->SwitchToPreviousInputMethod();
- EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
- manager_->SwitchToPreviousInputMethod();
- EXPECT_EQ("xkb:us:intl:eng", manager_->GetCurrentInputMethod().id());
- manager_->SwitchToPreviousInputMethod();
- EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
- manager_->SwitchToNextInputMethod();
- EXPECT_EQ("xkb:us:intl:eng", manager_->GetCurrentInputMethod().id());
- manager_->SwitchToNextInputMethod();
- EXPECT_EQ("xkb:us:altgr-intl:eng", manager_->GetCurrentInputMethod().id());
- manager_->SwitchToPreviousInputMethod();
- EXPECT_EQ("xkb:us:intl:eng", manager_->GetCurrentInputMethod().id());
- manager_->SwitchToPreviousInputMethod();
- EXPECT_EQ("xkb:us:altgr-intl:eng", manager_->GetCurrentInputMethod().id());
-}
-
-IN_PROC_BROWSER_TEST_F(InputMethodManagerTest, TestSwitchInputMethod) {
- manager_->EnableLayouts("en-US", "xkb:us::eng");
- EXPECT_EQ(5U, manager_->GetNumActiveInputMethods());
- EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
-
- // Henkan, Muhenkan, ZenkakuHankaku should be ignored when no Japanese IMEs
- // and keyboards are enabled.
- EXPECT_FALSE(manager_->SwitchInputMethod(
- ui::Accelerator(ui::VKEY_CONVERT, false, false, false)));
- EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
- EXPECT_FALSE(manager_->SwitchInputMethod(
- ui::Accelerator(ui::VKEY_NONCONVERT, false, false, false)));
- EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
- EXPECT_FALSE(manager_->SwitchInputMethod(
- ui::Accelerator(ui::VKEY_DBE_SBCSCHAR, false, false, false)));
- EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
- EXPECT_FALSE(manager_->SwitchInputMethod(
- ui::Accelerator(ui::VKEY_DBE_DBCSCHAR, false, false, false)));
- EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
-
- // Do the same tests for Korean.
- EXPECT_FALSE(manager_->SwitchInputMethod(
- ui::Accelerator(ui::VKEY_HANGUL, false, false, false)));
- EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
- EXPECT_FALSE(manager_->SwitchInputMethod(
- ui::Accelerator(ui::VKEY_SPACE, true, false, false)));
- EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
-
- // Enable "xkb:jp::jpn" and press Muhenkan/ZenkakuHankaku.
- manager_->EnableLayouts("ja", "xkb:us::eng");
- EXPECT_EQ(2U, manager_->GetNumActiveInputMethods());
- EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
- EXPECT_TRUE(manager_->SwitchInputMethod(
- ui::Accelerator(ui::VKEY_NONCONVERT, false, false, false)));
- EXPECT_EQ("xkb:jp::jpn", manager_->GetCurrentInputMethod().id());
- manager_->SwitchToPreviousInputMethod();
- EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
- EXPECT_TRUE(manager_->SwitchInputMethod(
- ui::Accelerator(ui::VKEY_DBE_SBCSCHAR, false, false, false)));
- EXPECT_EQ("xkb:jp::jpn", manager_->GetCurrentInputMethod().id());
- manager_->SwitchToPreviousInputMethod();
- EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
- EXPECT_TRUE(manager_->SwitchInputMethod(
- ui::Accelerator(ui::VKEY_DBE_DBCSCHAR, false, false, false)));
- EXPECT_EQ("xkb:jp::jpn", manager_->GetCurrentInputMethod().id());
-
- // Do the same tests for Korean.
- manager_->EnableLayouts("ko", "xkb:us::eng");
- EXPECT_EQ(2U, manager_->GetNumActiveInputMethods());
- EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
- EXPECT_TRUE(manager_->SwitchInputMethod(
- ui::Accelerator(ui::VKEY_HANGUL, false, false, false)));
- EXPECT_EQ("xkb:kr:kr104:kor", manager_->GetCurrentInputMethod().id());
- manager_->SwitchToPreviousInputMethod();
- EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
- EXPECT_TRUE(manager_->SwitchInputMethod(
- ui::Accelerator(ui::VKEY_SPACE, true, false, false)));
- EXPECT_EQ("xkb:kr:kr104:kor", manager_->GetCurrentInputMethod().id());
-}
-
-} // namespace input_method
-} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698