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

Side by Side Diff: ui/chromeos/touch_accessibility_enabler_unittest.cc

Issue 2504233004: Tweaks for: Toggle spoken feedback if two fingers are held down (Closed)
Patch Set: Update unit tests Created 4 years 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 unified diff | Download patch
« no previous file with comments | « ui/chromeos/touch_accessibility_enabler.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/chromeos/touch_accessibility_enabler.h" 5 #include "ui/chromeos/touch_accessibility_enabler.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/test/simple_test_tick_clock.h" 8 #include "base/test/simple_test_tick_clock.h"
9 #include "base/time/time.h" 9 #include "base/time/time.h"
10 #include "ui/aura/test/aura_test_base.h" 10 #include "ui/aura/test/aura_test_base.h"
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 116
117 generator_->set_current_location(gfx::Point(22, 34)); 117 generator_->set_current_location(gfx::Point(22, 34));
118 generator_->PressTouchId(2); 118 generator_->PressTouchId(2);
119 119
120 EXPECT_TRUE(enabler_->IsInTwoFingersDownForTesting()); 120 EXPECT_TRUE(enabler_->IsInTwoFingersDownForTesting());
121 EXPECT_EQ(0U, delegate_.feedback_progress_sound_count()); 121 EXPECT_EQ(0U, delegate_.feedback_progress_sound_count());
122 122
123 enabler_->TriggerOnTimerForTesting(); 123 enabler_->TriggerOnTimerForTesting();
124 EXPECT_EQ(0U, delegate_.feedback_progress_sound_count()); 124 EXPECT_EQ(0U, delegate_.feedback_progress_sound_count());
125 125
126 simulated_clock_->Advance(base::TimeDelta::FromMilliseconds(500)); 126 simulated_clock_->Advance(base::TimeDelta::FromMilliseconds(3000));
127 enabler_->TriggerOnTimerForTesting(); 127 enabler_->TriggerOnTimerForTesting();
128 EXPECT_EQ(1U, delegate_.feedback_progress_sound_count()); 128 EXPECT_EQ(1U, delegate_.feedback_progress_sound_count());
129 } 129 }
130 130
131 TEST_F(TouchAccessibilityEnablerTest, TogglesSpokenFeedback) { 131 TEST_F(TouchAccessibilityEnablerTest, TogglesSpokenFeedback) {
132 EXPECT_TRUE(enabler_->IsInNoFingersDownForTesting()); 132 EXPECT_TRUE(enabler_->IsInNoFingersDownForTesting());
133 generator_->set_current_location(gfx::Point(11, 12)); 133 generator_->set_current_location(gfx::Point(11, 12));
134 generator_->PressTouchId(1); 134 generator_->PressTouchId(1);
135 135
136 generator_->set_current_location(gfx::Point(22, 34)); 136 generator_->set_current_location(gfx::Point(22, 34));
137 generator_->PressTouchId(2); 137 generator_->PressTouchId(2);
138 138
139 EXPECT_TRUE(enabler_->IsInTwoFingersDownForTesting()); 139 EXPECT_TRUE(enabler_->IsInTwoFingersDownForTesting());
140 EXPECT_FALSE(delegate_.toggle_spoken_feedback()); 140 EXPECT_FALSE(delegate_.toggle_spoken_feedback());
141 141
142 enabler_->TriggerOnTimerForTesting(); 142 enabler_->TriggerOnTimerForTesting();
143 EXPECT_FALSE(delegate_.toggle_spoken_feedback()); 143 EXPECT_FALSE(delegate_.toggle_spoken_feedback());
144 144
145 simulated_clock_->Advance(base::TimeDelta::FromMilliseconds(3500)); 145 simulated_clock_->Advance(base::TimeDelta::FromMilliseconds(5000));
146 enabler_->TriggerOnTimerForTesting(); 146 enabler_->TriggerOnTimerForTesting();
147 EXPECT_TRUE(delegate_.toggle_spoken_feedback()); 147 EXPECT_TRUE(delegate_.toggle_spoken_feedback());
148 } 148 }
149 149
150 TEST_F(TouchAccessibilityEnablerTest, ThreeFingersCancelsDetection) { 150 TEST_F(TouchAccessibilityEnablerTest, ThreeFingersCancelsDetection) {
151 EXPECT_TRUE(enabler_->IsInNoFingersDownForTesting()); 151 EXPECT_TRUE(enabler_->IsInNoFingersDownForTesting());
152 generator_->set_current_location(gfx::Point(11, 12)); 152 generator_->set_current_location(gfx::Point(11, 12));
153 generator_->PressTouchId(1); 153 generator_->PressTouchId(1);
154 154
155 generator_->set_current_location(gfx::Point(22, 34)); 155 generator_->set_current_location(gfx::Point(22, 34));
(...skipping 16 matching lines...) Expand all
172 int half_slop = slop / 2; 172 int half_slop = slop / 2;
173 173
174 generator_->MoveTouch(gfx::Point(11 + half_slop, 12)); 174 generator_->MoveTouch(gfx::Point(11 + half_slop, 12));
175 EXPECT_TRUE(enabler_->IsInOneFingerDownForTesting()); 175 EXPECT_TRUE(enabler_->IsInOneFingerDownForTesting());
176 176
177 generator_->MoveTouch(gfx::Point(11 + slop + 1, 12)); 177 generator_->MoveTouch(gfx::Point(11 + slop + 1, 12));
178 EXPECT_TRUE(enabler_->IsInWaitForNoFingersForTesting()); 178 EXPECT_TRUE(enabler_->IsInWaitForNoFingersForTesting());
179 } 179 }
180 180
181 } // namespace ui 181 } // namespace ui
OLDNEW
« no previous file with comments | « ui/chromeos/touch_accessibility_enabler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698