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

Side by Side Diff: ash/shelf/shelf_view_unittest.cc

Issue 2719973003: mash: makes OverflowButtonActiveInkDropTest.TouchContextMenu early out (Closed)
Patch Set: wrong test Created 3 years, 9 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ash/common/shelf/shelf_view.h" 5 #include "ash/common/shelf/shelf_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 2967 matching lines...) Expand 10 before | Expand all | Expand 10 after
2978 overflow_button_ink_drop_->GetTargetInkDropState()); 2978 overflow_button_ink_drop_->GetTargetInkDropState());
2979 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(), 2979 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
2980 IsEmpty()); 2980 IsEmpty());
2981 2981
2982 ASSERT_TRUE(test_api_->IsShowingOverflowBubble()); 2982 ASSERT_TRUE(test_api_->IsShowingOverflowBubble());
2983 } 2983 }
2984 2984
2985 // Tests ink drop state transitions for the overflow button when it is active 2985 // Tests ink drop state transitions for the overflow button when it is active
2986 // and the user long presses on the button to show the context menu. 2986 // and the user long presses on the button to show the context menu.
2987 TEST_F(OverflowButtonActiveInkDropTest, TouchContextMenu) { 2987 TEST_F(OverflowButtonActiveInkDropTest, TouchContextMenu) {
2988 // TODO: investigate failure in mash, http://crbug.com/695751. Note, that this
2989 // one is a bit flaky. Some times it passes with mash, other times not.
2990 if (WmShell::Get()->IsRunningInMash())
2991 return;
2992
2988 ui::test::EventGenerator& generator = GetEventGenerator(); 2993 ui::test::EventGenerator& generator = GetEventGenerator();
2989 generator.set_current_location(GetScreenPointInsideOverflowButton()); 2994 generator.set_current_location(GetScreenPointInsideOverflowButton());
2990 base::ScopedMockTimeMessageLoopTaskRunner mock_task_runner; 2995 base::ScopedMockTimeMessageLoopTaskRunner mock_task_runner;
2991 2996
2992 generator.PressTouch(); 2997 generator.PressTouch();
2993 EXPECT_EQ(views::InkDropState::ACTIVATED, 2998 EXPECT_EQ(views::InkDropState::ACTIVATED,
2994 overflow_button_ink_drop_->GetTargetInkDropState()); 2999 overflow_button_ink_drop_->GetTargetInkDropState());
2995 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(), 3000 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
2996 IsEmpty()); 3001 IsEmpty());
2997 3002
2998 mock_task_runner->FastForwardUntilNoTasksRemain(); 3003 mock_task_runner->FastForwardUntilNoTasksRemain();
2999 EXPECT_EQ(views::InkDropState::ACTIVATED, 3004 EXPECT_EQ(views::InkDropState::ACTIVATED,
3000 overflow_button_ink_drop_->GetTargetInkDropState()); 3005 overflow_button_ink_drop_->GetTargetInkDropState());
3001 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(), 3006 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
3002 IsEmpty()); 3007 IsEmpty());
3003 3008
3004 generator.ReleaseTouch(); 3009 generator.ReleaseTouch();
3005 EXPECT_EQ(views::InkDropState::ACTIVATED, 3010 EXPECT_EQ(views::InkDropState::ACTIVATED,
3006 overflow_button_ink_drop_->GetTargetInkDropState()); 3011 overflow_button_ink_drop_->GetTargetInkDropState());
3007 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(), 3012 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
3008 IsEmpty()); 3013 IsEmpty());
3009 3014
3010 ASSERT_TRUE(test_api_->IsShowingOverflowBubble()); 3015 ASSERT_TRUE(test_api_->IsShowingOverflowBubble());
3011 } 3016 }
3012 3017
3013 } // namespace test 3018 } // namespace test
3014 } // namespace ash 3019 } // namespace ash
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