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

Side by Side Diff: cc/input/top_controls_manager_unittest.cc

Issue 906103002: Disable flaky subset of TopControlsManagerTest.* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 unified diff | Download patch
« no previous file with comments | « no previous file | 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "cc/input/top_controls_manager.h" 5 #include "cc/input/top_controls_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/time/time.h" 10 #include "base/time/time.h"
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 manager->ScrollBy(gfx::Vector2dF(0.f, -100.f)); 128 manager->ScrollBy(gfx::Vector2dF(0.f, -100.f));
129 EXPECT_FLOAT_EQ(0.f, manager->ControlsTopOffset()); 129 EXPECT_FLOAT_EQ(0.f, manager->ControlsTopOffset());
130 130
131 // See that scrolling down the page now will result in the controls hiding. 131 // See that scrolling down the page now will result in the controls hiding.
132 manager->ScrollBy(gfx::Vector2dF(0.f, 20.f)); 132 manager->ScrollBy(gfx::Vector2dF(0.f, 20.f));
133 EXPECT_FLOAT_EQ(-20.f, manager->ControlsTopOffset()); 133 EXPECT_FLOAT_EQ(-20.f, manager->ControlsTopOffset());
134 134
135 manager->ScrollEnd(); 135 manager->ScrollEnd();
136 } 136 }
137 137
138 TEST(TopControlsManagerTest, PartialShownHideAnimation) { 138 // Flaky. See http://crbug.com/456617.
139 TEST(TopControlsManagerTest, DISABLED_PartialShownHideAnimation) {
139 MockTopControlsManagerClient client(100.f, 0.5f, 0.5f); 140 MockTopControlsManagerClient client(100.f, 0.5f, 0.5f);
140 TopControlsManager* manager = client.manager(); 141 TopControlsManager* manager = client.manager();
141 manager->ScrollBegin(); 142 manager->ScrollBegin();
142 manager->ScrollBy(gfx::Vector2dF(0.f, 300.f)); 143 manager->ScrollBy(gfx::Vector2dF(0.f, 300.f));
143 EXPECT_FLOAT_EQ(-100.f, manager->ControlsTopOffset()); 144 EXPECT_FLOAT_EQ(-100.f, manager->ControlsTopOffset());
144 EXPECT_FLOAT_EQ(0.f, manager->ContentTopOffset()); 145 EXPECT_FLOAT_EQ(0.f, manager->ContentTopOffset());
145 manager->ScrollEnd(); 146 manager->ScrollEnd();
146 147
147 manager->ScrollBegin(); 148 manager->ScrollBegin();
148 manager->ScrollBy(gfx::Vector2dF(0.f, -15.f)); 149 manager->ScrollBy(gfx::Vector2dF(0.f, -15.f));
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 time = base::TimeDelta::FromMicroseconds(100) + time; 215 time = base::TimeDelta::FromMicroseconds(100) + time;
215 manager->Animate(time); 216 manager->Animate(time);
216 EXPECT_GT(manager->ControlsTopOffset(), previous_offset); 217 EXPECT_GT(manager->ControlsTopOffset(), previous_offset);
217 previous_offset = manager->ControlsTopOffset(); 218 previous_offset = manager->ControlsTopOffset();
218 } 219 }
219 EXPECT_FALSE(manager->animation()); 220 EXPECT_FALSE(manager->animation());
220 EXPECT_FLOAT_EQ(0.f, manager->ControlsTopOffset()); 221 EXPECT_FLOAT_EQ(0.f, manager->ControlsTopOffset());
221 EXPECT_FLOAT_EQ(100.f, manager->ContentTopOffset()); 222 EXPECT_FLOAT_EQ(100.f, manager->ContentTopOffset());
222 } 223 }
223 224
224 TEST(TopControlsManagerTest, PartialHiddenWithAmbiguousThresholdHides) { 225 // Flaky. See http://crbug.com/456617.
226 TEST(TopControlsManagerTest,
227 DISABLED_PartialHiddenWithAmbiguousThresholdHides) {
225 MockTopControlsManagerClient client(100.f, 0.25f, 0.25f); 228 MockTopControlsManagerClient client(100.f, 0.25f, 0.25f);
226 TopControlsManager* manager = client.manager(); 229 TopControlsManager* manager = client.manager();
227 230
228 manager->ScrollBegin(); 231 manager->ScrollBegin();
229 232
230 manager->ScrollBy(gfx::Vector2dF(0.f, 30.f)); 233 manager->ScrollBy(gfx::Vector2dF(0.f, 30.f));
231 EXPECT_FLOAT_EQ(-30.f, manager->ControlsTopOffset()); 234 EXPECT_FLOAT_EQ(-30.f, manager->ControlsTopOffset());
232 EXPECT_FLOAT_EQ(70.f, manager->ContentTopOffset()); 235 EXPECT_FLOAT_EQ(70.f, manager->ContentTopOffset());
233 236
234 manager->ScrollEnd(); 237 manager->ScrollEnd();
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 332
330 // Scrolls should no long be ignored. 333 // Scrolls should no long be ignored.
331 manager->ScrollBy(gfx::Vector2dF(0.f, -15.f)); 334 manager->ScrollBy(gfx::Vector2dF(0.f, -15.f));
332 EXPECT_FLOAT_EQ(-85.f, manager->ControlsTopOffset()); 335 EXPECT_FLOAT_EQ(-85.f, manager->ControlsTopOffset());
333 EXPECT_FLOAT_EQ(15.f, manager->ContentTopOffset()); 336 EXPECT_FLOAT_EQ(15.f, manager->ContentTopOffset());
334 manager->ScrollEnd(); 337 manager->ScrollEnd();
335 338
336 EXPECT_TRUE(manager->animation()); 339 EXPECT_TRUE(manager->animation());
337 } 340 }
338 341
339 TEST(TopControlsManagerTest, PinchBeginStartsAnimationIfNecessary) { 342 // Flaky. See http://crbug.com/456617.
343 TEST(TopControlsManagerTest, DISABLED_PinchBeginStartsAnimationIfNecessary) {
340 MockTopControlsManagerClient client(100.f, 0.5f, 0.5f); 344 MockTopControlsManagerClient client(100.f, 0.5f, 0.5f);
341 TopControlsManager* manager = client.manager(); 345 TopControlsManager* manager = client.manager();
342 346
343 manager->ScrollBegin(); 347 manager->ScrollBegin();
344 manager->ScrollBy(gfx::Vector2dF(0.f, 300.f)); 348 manager->ScrollBy(gfx::Vector2dF(0.f, 300.f));
345 EXPECT_FLOAT_EQ(-100.f, manager->ControlsTopOffset()); 349 EXPECT_FLOAT_EQ(-100.f, manager->ControlsTopOffset());
346 350
347 manager->PinchBegin(); 351 manager->PinchBegin();
348 EXPECT_FALSE(manager->animation()); 352 EXPECT_FALSE(manager->animation());
349 353
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 EXPECT_FLOAT_EQ(0.f, manager->ContentTopOffset()); 445 EXPECT_FLOAT_EQ(0.f, manager->ContentTopOffset());
442 446
443 client.SetTopControlsHeight(0.f); 447 client.SetTopControlsHeight(0.f);
444 EXPECT_FALSE(manager->animation()); 448 EXPECT_FALSE(manager->animation());
445 EXPECT_FLOAT_EQ(0.f, manager->ControlsTopOffset()); 449 EXPECT_FLOAT_EQ(0.f, manager->ControlsTopOffset());
446 EXPECT_FLOAT_EQ(0.f, manager->ContentTopOffset()); 450 EXPECT_FLOAT_EQ(0.f, manager->ContentTopOffset());
447 } 451 }
448 452
449 } // namespace 453 } // namespace
450 } // namespace cc 454 } // namespace cc
OLDNEW
« 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