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

Unified Diff: ash/accelerators/magnifier_key_scroller_unittest.cc

Issue 1209663002: Use EventHandler for IME (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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
« no previous file with comments | « ash/accelerators/accelerator_controller_unittest.cc ('k') | ash/ash.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/magnifier_key_scroller_unittest.cc
diff --git a/ash/accelerators/magnifier_key_scroller_unittest.cc b/ash/accelerators/magnifier_key_scroller_unittest.cc
index 69f2273f7154dbce2ac72fac64b78229e03fa216..d24e9c343fb9cba3fecaf20f6c3955d2ae57eaa0 100644
--- a/ash/accelerators/magnifier_key_scroller_unittest.cc
+++ b/ash/accelerators/magnifier_key_scroller_unittest.cc
@@ -63,7 +63,7 @@ TEST_F(MagnifierKeyScrollerTest, Basic) {
generator.ReleaseKey(ui::VKEY_DOWN, 0);
EXPECT_EQ("200,150", controller->GetWindowPosition().ToString());
RunAllPendingInMessageLoop();
- EXPECT_TRUE(delegate.event());
+ ASSERT_TRUE(delegate.event());
EXPECT_EQ(ui::ET_KEY_PRESSED, delegate.event()->type());
delegate.reset();
@@ -84,27 +84,27 @@ TEST_F(MagnifierKeyScrollerTest, Basic) {
controller->SetEnabled(false);
generator.PressKey(ui::VKEY_DOWN, ui::EF_SHIFT_DOWN);
- EXPECT_TRUE(delegate.event());
+ ASSERT_TRUE(delegate.event());
EXPECT_EQ(ui::ET_KEY_PRESSED, delegate.event()->type());
delegate.reset();
generator.ReleaseKey(ui::VKEY_DOWN, 0);
- EXPECT_TRUE(delegate.event());
+ ASSERT_TRUE(delegate.event());
EXPECT_EQ(ui::ET_KEY_RELEASED, delegate.event()->type());
delegate.reset();
generator.PressKey(ui::VKEY_DOWN, ui::EF_SHIFT_DOWN);
- EXPECT_TRUE(delegate.event());
+ ASSERT_TRUE(delegate.event());
EXPECT_EQ(ui::ET_KEY_PRESSED, delegate.event()->type());
delegate.reset();
generator.PressKey(ui::VKEY_DOWN, ui::EF_SHIFT_DOWN);
- EXPECT_TRUE(delegate.event());
+ ASSERT_TRUE(delegate.event());
EXPECT_EQ(ui::ET_KEY_PRESSED, delegate.event()->type());
delegate.reset();
generator.ReleaseKey(ui::VKEY_DOWN, 0);
- EXPECT_TRUE(delegate.event());
+ ASSERT_TRUE(delegate.event());
EXPECT_EQ(ui::ET_KEY_RELEASED, delegate.event()->type());
delegate.reset();
}
« no previous file with comments | « ash/accelerators/accelerator_controller_unittest.cc ('k') | ash/ash.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698