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

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

Issue 2769833002: mash: Make OverflowButtonInkDropTest.TouchContextMenu early out (Closed)
Patch Set: 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 2736 matching lines...) Expand 10 before | Expand all | Expand 10 after
2747 overflow_button_ink_drop_->GetTargetInkDropState()); 2747 overflow_button_ink_drop_->GetTargetInkDropState());
2748 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(), 2748 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
2749 IsEmpty()); 2749 IsEmpty());
2750 2750
2751 EXPECT_FALSE(test_api_->IsShowingOverflowBubble()); 2751 EXPECT_FALSE(test_api_->IsShowingOverflowBubble());
2752 } 2752 }
2753 2753
2754 // Tests ink drop state transitions for the overflow button when the user long 2754 // Tests ink drop state transitions for the overflow button when the user long
2755 // presses on the button to show the context menu. 2755 // presses on the button to show the context menu.
2756 TEST_F(OverflowButtonInkDropTest, TouchContextMenu) { 2756 TEST_F(OverflowButtonInkDropTest, TouchContextMenu) {
2757 // TODO: investigate failure in mash, http://crbug.com/695751. Note, that this
2758 // one is a bit flaky. Some times it passes with mash, other times not.
2759 if (WmShell::Get()->IsRunningInMash())
2760 return;
2761
2757 ui::test::EventGenerator& generator = GetEventGenerator(); 2762 ui::test::EventGenerator& generator = GetEventGenerator();
2758 generator.set_current_location(GetScreenPointInsideOverflowButton()); 2763 generator.set_current_location(GetScreenPointInsideOverflowButton());
2759 base::ScopedMockTimeMessageLoopTaskRunner mock_task_runner; 2764 base::ScopedMockTimeMessageLoopTaskRunner mock_task_runner;
2760 2765
2761 generator.PressTouch(); 2766 generator.PressTouch();
2762 EXPECT_EQ(views::InkDropState::ACTION_PENDING, 2767 EXPECT_EQ(views::InkDropState::ACTION_PENDING,
2763 overflow_button_ink_drop_->GetTargetInkDropState()); 2768 overflow_button_ink_drop_->GetTargetInkDropState());
2764 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(), 2769 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
2765 ElementsAre(views::InkDropState::ACTION_PENDING)); 2770 ElementsAre(views::InkDropState::ACTION_PENDING));
2766 2771
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
3028 EXPECT_EQ(views::InkDropState::ACTIVATED, 3033 EXPECT_EQ(views::InkDropState::ACTIVATED,
3029 overflow_button_ink_drop_->GetTargetInkDropState()); 3034 overflow_button_ink_drop_->GetTargetInkDropState());
3030 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(), 3035 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
3031 IsEmpty()); 3036 IsEmpty());
3032 3037
3033 ASSERT_TRUE(test_api_->IsShowingOverflowBubble()); 3038 ASSERT_TRUE(test_api_->IsShowingOverflowBubble());
3034 } 3039 }
3035 3040
3036 } // namespace test 3041 } // namespace test
3037 } // namespace ash 3042 } // 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