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

Unified Diff: chrome/browser/chromeos/extensions/input_view_browsertest.cc

Issue 272293002: Expand the IME test framework to test the Compact layout. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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: chrome/browser/chromeos/extensions/input_view_browsertest.cc
diff --git a/chrome/browser/chromeos/extensions/input_view_browsertest.cc b/chrome/browser/chromeos/extensions/input_view_browsertest.cc
index 2b7c52627bbd467451e9df6f25dc71e446837738..ef4196e344d500332f5dc38421ca668af5196fb9 100644
--- a/chrome/browser/chromeos/extensions/input_view_browsertest.cc
+++ b/chrome/browser/chromeos/extensions/input_view_browsertest.cc
@@ -31,12 +31,15 @@ const base::FilePath::CharType kInputViewTestDir[] =
"chromeos/virtual_keyboard/inputview/";
const base::FilePath::CharType kBaseKeyboardTestFramework[] = "test_base.js";
+const char kDefaultLayout[] = "us";
+const char kCompactLayout[] = "us.compact";
+
struct InputViewConfig : public VirtualKeyboardBrowserTestConfig {
- explicit InputViewConfig(std::string id) {
+ explicit InputViewConfig(std::string id, std::string layout) {
base_framework_ = kBaseKeyboardTestFramework;
extension_id_ = id;
test_dir_ = kInputViewTestDir;
- url_ = "chrome-extension://" + id + "/inputview.html?id=us-altgr-intl";
+ url_ = "chrome-extension://" + id + "/inputview.html?id=" + layout;
}
};
@@ -78,11 +81,27 @@ class InputViewBrowserTest : public VirtualKeyboardBrowserTest {
IN_PROC_BROWSER_TEST_F(InputViewBrowserTest, TypingTest) {
std::string id = InstallIMEExtension();
ASSERT_FALSE(id.empty());
- RunTest(base::FilePath("typing_test.js"), InputViewConfig(id));
+ RunTest(base::FilePath("typing_test.js"),
+ InputViewConfig(id, kDefaultLayout));
+}
+
+IN_PROC_BROWSER_TEST_F(InputViewBrowserTest, CompactTypingTest) {
+ std::string id = InstallIMEExtension();
+ ASSERT_FALSE(id.empty());
+ RunTest(base::FilePath("typing_test.js"),
+ InputViewConfig(id, kCompactLayout));
}
IN_PROC_BROWSER_TEST_F(InputViewBrowserTest, KeysetTransitionTest) {
std::string id = InstallIMEExtension();
ASSERT_FALSE(id.empty());
- RunTest(base::FilePath("keyset_transition_test.js"), InputViewConfig(id));
+ RunTest(base::FilePath("keyset_transition_test.js"),
+ InputViewConfig(id, kDefaultLayout));
+}
+
+IN_PROC_BROWSER_TEST_F(InputViewBrowserTest, CompactKeysetTransitionTest) {
+ std::string id = InstallIMEExtension();
+ ASSERT_FALSE(id.empty());
+ RunTest(base::FilePath("keyset_transition_test.js"),
+ InputViewConfig(id, kCompactLayout));
}

Powered by Google App Engine
This is Rietveld 408576698