Check for new fling stop behavior
Fling stops are now sent before every new gesture. This CL changes
tests to match that behavior.
BUG=chromium:824565
TEST=None
CQ-DEPEND=CL:1464563
Change-Id: I54a9af91b36c3c0279a6a599880c2eddc2eb60c2
Reviewed-on: https://chromium-review.googlesource.com/1465193
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Sean O'Brien <seobrien@chromium.org>
Reviewed-by: Andrew de los Reyes <adlr@chromium.org>
diff --git a/tests/eve-1.0/palm_rejection.py b/tests/eve-1.0/palm_rejection.py
index a645216..716b972 100644
--- a/tests/eve-1.0/palm_rejection.py
+++ b/tests/eve-1.0/palm_rejection.py
@@ -24,6 +24,6 @@
MotionValidator("> 400"),
]
fuzzy.unexpected = [
- FlingStopValidator("<60"),
+ FlingStopValidator("<70"),
]
return fuzzy.Check(gestures)
diff --git a/tests/link/unexpected_fling_cancel2.py b/tests/link/unexpected_fling_cancel2.py
index 222ef47..58664c8 100644
--- a/tests/link/unexpected_fling_cancel2.py
+++ b/tests/link/unexpected_fling_cancel2.py
@@ -12,6 +12,7 @@
def Validate(raw, events, gestures):
fuzzy = FuzzyCheck()
fuzzy.expected = [
+ FlingStopValidator(),
ScrollValidator(">= 100"),
FlingValidator(">= 100"),
]
diff --git a/tests/relm-1.0/stale-finger-should-scroll.py b/tests/relm-1.0/stale-finger-should-scroll.py
index 643fe96..9ff210f 100644
--- a/tests/relm-1.0/stale-finger-should-scroll.py
+++ b/tests/relm-1.0/stale-finger-should-scroll.py
@@ -10,6 +10,7 @@
def Validate(raw, events, gestures):
fuzzy = FuzzyCheck()
fuzzy.expected = [
+ FlingStopValidator(),
ScrollValidator(),
FlingValidator(),
]
diff --git a/tests/snow2.3/refling.py b/tests/snow2.3/refling.py
index 70a7176..3ab957f 100644
--- a/tests/snow2.3/refling.py
+++ b/tests/snow2.3/refling.py
@@ -23,11 +23,13 @@
FlingStopValidator("1"),
ScrollValidator("== 268.3 ~ 208.3"),
FlingValidator("> 0"),
+ FlingStopValidator("1"),
ScrollValidator("== 349.2 ~ 250.0"),
FlingValidator("> 0"),
FlingStopValidator("1"),
ScrollValidator("< 833.3", merge=True),
FlingValidator("> 0"),
+ FlingStopValidator("1"),
ScrollValidator("== 345.0 ~ 250.0"),
FlingValidator("> 0"),
]
diff --git a/tests/snow2.3/scrolling_with_low_press_fingers_2.py b/tests/snow2.3/scrolling_with_low_press_fingers_2.py
index d3fb3c0..93a8b36 100644
--- a/tests/snow2.3/scrolling_with_low_press_fingers_2.py
+++ b/tests/snow2.3/scrolling_with_low_press_fingers_2.py
@@ -11,6 +11,7 @@
def Validate(raw, events, gestures):
fuzzy = FuzzyCheck()
fuzzy.expected = [
+ FlingStopValidator(),
ScrollValidator(">= 1000.0 ~ 416.7"),
FlingValidator(),
]
diff --git a/tests/snow2.3/scrolling_with_low_press_fingers_3.py b/tests/snow2.3/scrolling_with_low_press_fingers_3.py
index a447238..1001afb 100644
--- a/tests/snow2.3/scrolling_with_low_press_fingers_3.py
+++ b/tests/snow2.3/scrolling_with_low_press_fingers_3.py
@@ -11,6 +11,7 @@
def Validate(raw, events, gestures):
fuzzy = FuzzyCheck()
fuzzy.expected = [
+ FlingStopValidator(),
ScrollValidator(">= 1083.3 ~ 416.7"),
FlingValidator(),
]
diff --git a/tests/snow2.3/scrolling_with_low_press_fingers_4.py b/tests/snow2.3/scrolling_with_low_press_fingers_4.py
index bd7369e..eb1fcb7 100644
--- a/tests/snow2.3/scrolling_with_low_press_fingers_4.py
+++ b/tests/snow2.3/scrolling_with_low_press_fingers_4.py
@@ -11,6 +11,7 @@
def Validate(raw, events, gestures):
fuzzy = FuzzyCheck()
fuzzy.expected = [
+ FlingStopValidator(),
ScrollValidator(">= 1250.0 ~ 416.7"),
FlingValidator(),
]
diff --git a/tests/snow2.3/scrolling_with_low_press_fingers_5.py b/tests/snow2.3/scrolling_with_low_press_fingers_5.py
index fa94370..58c3b11 100644
--- a/tests/snow2.3/scrolling_with_low_press_fingers_5.py
+++ b/tests/snow2.3/scrolling_with_low_press_fingers_5.py
@@ -11,6 +11,7 @@
def Validate(raw, events, gestures):
fuzzy = FuzzyCheck()
fuzzy.expected = [
+ FlingStopValidator(),
ScrollValidator(">= 1750.0 ~ 416.7"),
FlingValidator(),
]