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

Side by Side Diff: ash/common/system/ime/tray_ime_chromeos_unittest.cc

Issue 2713923002: chromeos: moves a bunch of tests to common_unittests (Closed)
Patch Set: feedback Created 3 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/common/system/ime/tray_ime_chromeos.h" 5 #include "ash/common/system/ime/tray_ime_chromeos.h"
6 6
7 #include "ash/common/accessibility_delegate.h" 7 #include "ash/common/accessibility_delegate.h"
8 #include "ash/common/accessibility_types.h" 8 #include "ash/common/accessibility_types.h"
9 #include "ash/common/system/chromeos/ime_menu/ime_list_view.h" 9 #include "ash/common/system/chromeos/ime_menu/ime_list_view.h"
10 #include "ash/common/system/tray/system_tray_notifier.h" 10 #include "ash/common/system/tray/system_tray_notifier.h"
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 EXPECT_FALSE(default_view()->visible()); 152 EXPECT_FALSE(default_view()->visible());
153 SetIMELength(1); 153 SetIMELength(1);
154 EXPECT_TRUE(default_view()->visible()); 154 EXPECT_TRUE(default_view()->visible());
155 SetIMELength(2); 155 SetIMELength(2);
156 EXPECT_TRUE(default_view()->visible()); 156 EXPECT_TRUE(default_view()->visible());
157 } 157 }
158 158
159 // Tests that if no IMEs are present the default view is hidden when a11y is 159 // Tests that if no IMEs are present the default view is hidden when a11y is
160 // enabled. 160 // enabled.
161 TEST_F(TrayIMETest, HidesOnA11yEnabled) { 161 TEST_F(TrayIMETest, HidesOnA11yEnabled) {
162 // TODO: investigate failure in mash. http://crbug.com/695561.
163 if (WmShell::Get()->IsRunningInMash())
164 return;
165
162 SetIMELength(0); 166 SetIMELength(0);
163 SuppressKeyboard(); 167 SuppressKeyboard();
164 EXPECT_TRUE(default_view()->visible()); 168 EXPECT_TRUE(default_view()->visible());
165 // Enable a11y keyboard. 169 // Enable a11y keyboard.
166 SetAccessibilityKeyboardEnabled(true); 170 SetAccessibilityKeyboardEnabled(true);
167 EXPECT_FALSE(default_view()->visible()); 171 EXPECT_FALSE(default_view()->visible());
168 // Disable the a11y keyboard. 172 // Disable the a11y keyboard.
169 SetAccessibilityKeyboardEnabled(false); 173 SetAccessibilityKeyboardEnabled(false);
170 EXPECT_TRUE(default_view()->visible()); 174 EXPECT_TRUE(default_view()->visible());
171 } 175 }
172 176
173 // Tests that clicking on the keyboard toggle causes the virtual keyboard 177 // Tests that clicking on the keyboard toggle causes the virtual keyboard
174 // to toggle between enabled and disabled. 178 // to toggle between enabled and disabled.
175 TEST_F(TrayIMETest, PerformActionOnDetailedView) { 179 TEST_F(TrayIMETest, PerformActionOnDetailedView) {
180 // TODO: investigate failure in mash. http://crbug.com/695561.
181 if (WmShell::Get()->IsRunningInMash())
182 return;
183
176 SetIMELength(0); 184 SetIMELength(0);
177 SuppressKeyboard(); 185 SuppressKeyboard();
178 EXPECT_FALSE(keyboard::IsKeyboardEnabled()); 186 EXPECT_FALSE(keyboard::IsKeyboardEnabled());
179 views::View* toggle = GetToggleView(); 187 views::View* toggle = GetToggleView();
180 ui::GestureEvent tap(0, 0, 0, base::TimeTicks(), 188 ui::GestureEvent tap(0, 0, 0, base::TimeTicks(),
181 ui::GestureEventDetails(ui::ET_GESTURE_TAP)); 189 ui::GestureEventDetails(ui::ET_GESTURE_TAP));
182 // Enable the keyboard. 190 // Enable the keyboard.
183 toggle->OnGestureEvent(&tap); 191 toggle->OnGestureEvent(&tap);
184 EXPECT_TRUE(keyboard::IsKeyboardEnabled()); 192 EXPECT_TRUE(keyboard::IsKeyboardEnabled());
185 EXPECT_TRUE(default_view()->visible()); 193 EXPECT_TRUE(default_view()->visible());
186 194
187 // Clicking again should disable the keyboard. 195 // Clicking again should disable the keyboard.
188 toggle = GetToggleView(); 196 toggle = GetToggleView();
189 tap = ui::GestureEvent(0, 0, 0, base::TimeTicks(), 197 tap = ui::GestureEvent(0, 0, 0, base::TimeTicks(),
190 ui::GestureEventDetails(ui::ET_GESTURE_TAP)); 198 ui::GestureEventDetails(ui::ET_GESTURE_TAP));
191 toggle->OnGestureEvent(&tap); 199 toggle->OnGestureEvent(&tap);
192 EXPECT_FALSE(keyboard::IsKeyboardEnabled()); 200 EXPECT_FALSE(keyboard::IsKeyboardEnabled());
193 EXPECT_TRUE(default_view()->visible()); 201 EXPECT_TRUE(default_view()->visible());
194 } 202 }
195 203
196 } // namespace ash 204 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/shelf/shelf_window_watcher_unittest.cc ('k') | ash/common/system/tray/system_tray_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698