OLD | NEW |
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 "ui/events/gestures/gesture_provider_aura.h" | 5 #include "ui/events/gestures/gesture_provider_aura.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 | 8 |
9 #include "base/message_loop/message_loop.h" | 9 #include "base/test/scoped_task_environment.h" |
10 #include "testing/gtest/include/gtest/gtest.h" | 10 #include "testing/gtest/include/gtest/gtest.h" |
11 #include "ui/events/event_utils.h" | 11 #include "ui/events/event_utils.h" |
12 | 12 |
13 namespace ui { | 13 namespace ui { |
14 | 14 |
15 class GestureProviderAuraTest : public testing::Test, | 15 class GestureProviderAuraTest : public testing::Test, |
16 public GestureProviderAuraClient { | 16 public GestureProviderAuraClient { |
17 public: | 17 public: |
18 GestureProviderAuraTest() {} | 18 GestureProviderAuraTest() |
| 19 : scoped_task_environment_( |
| 20 base::test::ScopedTaskEnvironment::MainThreadType::UI) {} |
19 | 21 |
20 ~GestureProviderAuraTest() override {} | 22 ~GestureProviderAuraTest() override {} |
21 | 23 |
22 void OnGestureEvent(GestureConsumer* raw_input_consumer, | 24 void OnGestureEvent(GestureConsumer* raw_input_consumer, |
23 GestureEvent* event) override {} | 25 GestureEvent* event) override {} |
24 | 26 |
25 void SetUp() override { | 27 void SetUp() override { |
26 consumer_.reset(new GestureConsumer()); | 28 consumer_.reset(new GestureConsumer()); |
27 provider_.reset(new GestureProviderAura(consumer_.get(), this)); | 29 provider_.reset(new GestureProviderAura(consumer_.get(), this)); |
28 } | 30 } |
29 | 31 |
30 void TearDown() override { provider_.reset(); } | 32 void TearDown() override { provider_.reset(); } |
31 | 33 |
32 GestureProviderAura* provider() { return provider_.get(); } | 34 GestureProviderAura* provider() { return provider_.get(); } |
33 | 35 |
34 private: | 36 private: |
35 std::unique_ptr<GestureConsumer> consumer_; | 37 std::unique_ptr<GestureConsumer> consumer_; |
36 std::unique_ptr<GestureProviderAura> provider_; | 38 std::unique_ptr<GestureProviderAura> provider_; |
37 base::MessageLoopForUI message_loop_; | 39 base::test::ScopedTaskEnvironment scoped_task_environment_; |
38 }; | 40 }; |
39 | 41 |
40 TEST_F(GestureProviderAuraTest, IgnoresExtraPressEvents) { | 42 TEST_F(GestureProviderAuraTest, IgnoresExtraPressEvents) { |
41 base::TimeTicks time = ui::EventTimeForNow(); | 43 base::TimeTicks time = ui::EventTimeForNow(); |
42 TouchEvent press1( | 44 TouchEvent press1( |
43 ET_TOUCH_PRESSED, gfx::Point(10, 10), time, | 45 ET_TOUCH_PRESSED, gfx::Point(10, 10), time, |
44 PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 0)); | 46 PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 0)); |
45 EXPECT_TRUE(provider()->OnTouchEvent(&press1)); | 47 EXPECT_TRUE(provider()->OnTouchEvent(&press1)); |
46 | 48 |
47 time += base::TimeDelta::FromMilliseconds(10); | 49 time += base::TimeDelta::FromMilliseconds(10); |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
133 pointerDetails2.radius_y += 1; | 135 pointerDetails2.radius_y += 1; |
134 TouchEvent move0_4(ET_TOUCH_MOVED, gfx::Point(), time, pointerDetails2, 0, | 136 TouchEvent move0_4(ET_TOUCH_MOVED, gfx::Point(), time, pointerDetails2, 0, |
135 kAngle); | 137 kAngle); |
136 move0_4.set_location_f(gfx::PointF(70, 75.1f)); | 138 move0_4.set_location_f(gfx::PointF(70, 75.1f)); |
137 move0_4.set_root_location_f(gfx::PointF(70, 75.1f)); | 139 move0_4.set_root_location_f(gfx::PointF(70, 75.1f)); |
138 } | 140 } |
139 | 141 |
140 // TODO(jdduke): Test whether event marked as scroll trigger. | 142 // TODO(jdduke): Test whether event marked as scroll trigger. |
141 | 143 |
142 } // namespace ui | 144 } // namespace ui |
OLD | NEW |