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

Unified Diff: ui/views/controls/slider_unittest.cc

Issue 2717583002: Improve views::Slider keyboard handling. (Closed)
Patch Set: add test coverage 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/controls/slider.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/slider_unittest.cc
diff --git a/ui/views/controls/slider_unittest.cc b/ui/views/controls/slider_unittest.cc
index 44893c97c257d2614e399d5ded4c1171ce5d6097..6bd6706d6b23c836349c237673cb6a30a8690b76 100644
--- a/ui/views/controls/slider_unittest.cc
+++ b/ui/views/controls/slider_unittest.cc
@@ -262,10 +262,8 @@ TEST_F(SliderTest, SliderValueForScrollGesture) {
// Scroll below the minimum.
slider()->SetValue(0.5);
event_generator()->GestureScrollSequence(
- gfx::Point(0.5 * max_x(), 0.5 * max_y()),
- gfx::Point(0, 0),
- base::TimeDelta::FromMilliseconds(10),
- 5 /* steps */);
+ gfx::Point(0.5 * max_x(), 0.5 * max_y()), gfx::Point(0, 0),
+ base::TimeDelta::FromMilliseconds(10), 5 /* steps */);
EXPECT_EQ(0, slider()->value());
// Scroll above the maximum.
@@ -278,10 +276,9 @@ TEST_F(SliderTest, SliderValueForScrollGesture) {
// Scroll somewhere in the middle.
slider()->SetValue(0.25);
event_generator()->GestureScrollSequence(
- gfx::Point(0.25 * max_x(), 0.25 * max_y()),
- gfx::Point(0.75 * max_x(), 0.75 * max_y()),
- base::TimeDelta::FromMilliseconds(10),
- 5 /* steps */);
+ gfx::Point(0.25 * max_x(), 0.25 * max_y()),
+ gfx::Point(0.75 * max_x(), 0.75 * max_y()),
+ base::TimeDelta::FromMilliseconds(10), 5 /* steps */);
EXPECT_NEAR(0.75, slider()->value(), 0.03);
}
@@ -296,6 +293,33 @@ TEST_F(SliderTest, SliderValueForKeyboard) {
slider()->SetValue(value);
event_generator()->PressKey(ui::VKEY_LEFT, 0);
EXPECT_LT(slider()->value(), value);
+
+ slider()->SetValue(value);
+ event_generator()->PressKey(ui::VKEY_UP, 0);
+ EXPECT_GT(slider()->value(), value);
+
+ slider()->SetValue(value);
+ event_generator()->PressKey(ui::VKEY_DOWN, 0);
+ EXPECT_LT(slider()->value(), value);
+
+ // RTL reverse left/right but not up/down.
+ base::i18n::SetICUDefaultLocale("he");
+ EXPECT_TRUE(base::i18n::IsRTL());
+
+ event_generator()->PressKey(ui::VKEY_RIGHT, 0);
+ EXPECT_LT(slider()->value(), value);
+
+ slider()->SetValue(value);
+ event_generator()->PressKey(ui::VKEY_LEFT, 0);
+ EXPECT_GT(slider()->value(), value);
+
+ slider()->SetValue(value);
+ event_generator()->PressKey(ui::VKEY_UP, 0);
+ EXPECT_GT(slider()->value(), value);
+
+ slider()->SetValue(value);
+ event_generator()->PressKey(ui::VKEY_DOWN, 0);
+ EXPECT_LT(slider()->value(), value);
}
// Verifies the correct SliderListener events are raised for a tap gesture.
« no previous file with comments | « ui/views/controls/slider.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698