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

Unified Diff: ui/aura/gestures/gesture_recognizer_unittest.cc

Issue 333893002: Use shorter timeouts in GestureRecognizerTest suite. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/gestures/gesture_recognizer_unittest.cc
diff --git a/ui/aura/gestures/gesture_recognizer_unittest.cc b/ui/aura/gestures/gesture_recognizer_unittest.cc
index d2c150b5ee61b76b81a01e30d42f6ef859e26c56..a9df40cbe11c0af3d6fcd506677efb07b70a7fe5 100644
--- a/ui/aura/gestures/gesture_recognizer_unittest.cc
+++ b/ui/aura/gestures/gesture_recognizer_unittest.cc
@@ -691,6 +691,10 @@ class GestureRecognizerTest : public AuraTestBase,
: switches::kUnifiedGestureDetectorDisabled);
AuraTestBase::SetUp();
+ ui::GestureConfiguration::set_min_touch_down_duration_in_seconds_for_click(
+ 0.001);
+ ui::GestureConfiguration::set_show_press_delay_in_ms(2);
+ ui::GestureConfiguration::set_long_press_time_in_seconds(0.003);
}
DISALLOW_COPY_AND_ASSIGN(GestureRecognizerTest);
@@ -1325,6 +1329,9 @@ TEST_P(GestureRecognizerTest, GestureEventNonRailFling) {
// Check that appropriate touch events generate long press events
TEST_P(GestureRecognizerTest, GestureEventLongPress) {
+ ui::GestureConfiguration::set_max_touch_down_duration_in_seconds_for_click(
+ 0.0025);
+
scoped_ptr<GestureEventConsumeDelegate> delegate(
new GestureEventConsumeDelegate());
const int kWindowWidth = 123;
@@ -1376,7 +1383,6 @@ TEST_P(GestureRecognizerTest, GestureEventLongPressCancelledByScroll) {
scoped_ptr<GestureEventConsumeDelegate> delegate(
new GestureEventConsumeDelegate());
TimedEvents tes;
- ui::GestureConfiguration::set_long_press_time_in_seconds(.01);
const int kWindowWidth = 123;
const int kWindowHeight = 45;
const int kTouchId = 6;
@@ -1420,6 +1426,8 @@ TEST_P(GestureRecognizerTest, GestureEventLongPressCancelledByScroll) {
// Check that appropriate touch events generate long tap events
TEST_P(GestureRecognizerTest, GestureEventLongTap) {
+ ui::GestureConfiguration::set_max_touch_down_duration_in_seconds_for_click(
+ 0.0025);
scoped_ptr<GestureEventConsumeDelegate> delegate(
new GestureEventConsumeDelegate());
const int kWindowWidth = 123;
@@ -1472,7 +1480,6 @@ TEST_P(GestureRecognizerTest, GestureEventLongPressCancelledBySecondTap) {
scoped_ptr<GestureEventConsumeDelegate> delegate(
new GestureEventConsumeDelegate());
TimedEvents tes;
- ui::GestureConfiguration::set_long_press_time_in_seconds(.01);
const int kWindowWidth = 300;
const int kWindowHeight = 400;
const int kTouchId1 = 8;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698