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

Unified Diff: ash/common/shelf/shelf_tooltip_manager_unittest.cc

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/shelf/shelf_tooltip_manager.cc ('k') | ash/common/shelf/shelf_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/shelf/shelf_tooltip_manager_unittest.cc
diff --git a/ash/common/shelf/shelf_tooltip_manager_unittest.cc b/ash/common/shelf/shelf_tooltip_manager_unittest.cc
deleted file mode 100644
index 955301fd60c7f4d7419f8c166c81864768efaab3..0000000000000000000000000000000000000000
--- a/ash/common/shelf/shelf_tooltip_manager_unittest.cc
+++ /dev/null
@@ -1,246 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ash/common/shelf/shelf_tooltip_manager.h"
-
-#include "ash/common/shelf/app_list_button.h"
-#include "ash/common/shelf/shelf_model.h"
-#include "ash/common/shelf/shelf_view.h"
-#include "ash/common/shelf/wm_shelf.h"
-#include "ash/common/test/test_shelf_item_delegate.h"
-#include "ash/common/wm_shell.h"
-#include "ash/test/ash_test_base.h"
-#include "ash/test/shelf_view_test_api.h"
-#include "base/memory/ptr_util.h"
-#include "ui/events/event_constants.h"
-#include "ui/events/test/event_generator.h"
-#include "ui/views/bubble/bubble_dialog_delegate.h"
-#include "ui/views/widget/widget.h"
-
-namespace ash {
-namespace test {
-
-class ShelfTooltipManagerTest : public AshTestBase {
- public:
- ShelfTooltipManagerTest() {}
- ~ShelfTooltipManagerTest() override {}
-
- void SetUp() override {
- AshTestBase::SetUp();
- shelf_view_ = GetPrimaryShelf()->GetShelfViewForTesting();
- tooltip_manager_ = test::ShelfViewTestAPI(shelf_view_).tooltip_manager();
- tooltip_manager_->set_timer_delay_for_test(0);
- }
-
- bool IsTimerRunning() { return tooltip_manager_->timer_.IsRunning(); }
- views::Widget* GetTooltip() { return tooltip_manager_->bubble_->GetWidget(); }
-
- std::unique_ptr<views::Widget> CreateTestWidget() {
- std::unique_ptr<views::Widget> widget = base::MakeUnique<views::Widget>();
- views::Widget::InitParams params;
- params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
- params.context = CurrentContext();
- widget->Init(params);
- widget->Show();
- return widget;
- }
-
- protected:
- ShelfView* shelf_view_;
- ShelfTooltipManager* tooltip_manager_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ShelfTooltipManagerTest);
-};
-
-TEST_F(ShelfTooltipManagerTest, ShowTooltip) {
- tooltip_manager_->ShowTooltip(shelf_view_->GetAppListButton());
- EXPECT_TRUE(tooltip_manager_->IsVisible());
- EXPECT_FALSE(IsTimerRunning());
-}
-
-TEST_F(ShelfTooltipManagerTest, ShowTooltipWithDelay) {
- // ShowTooltipWithDelay should start the timer instead of showing immediately.
- tooltip_manager_->ShowTooltipWithDelay(shelf_view_->GetAppListButton());
- EXPECT_FALSE(tooltip_manager_->IsVisible());
- EXPECT_TRUE(IsTimerRunning());
- // TODO: Test that the delayed tooltip is shown, without flaky failures.
-}
-
-TEST_F(ShelfTooltipManagerTest, DoNotShowForInvalidView) {
- // The manager should not show or start the timer for a null view.
- tooltip_manager_->ShowTooltip(nullptr);
- EXPECT_FALSE(tooltip_manager_->IsVisible());
- tooltip_manager_->ShowTooltipWithDelay(nullptr);
- EXPECT_FALSE(IsTimerRunning());
-
- // The manager should not show or start the timer for a non-shelf view.
- views::View view;
- tooltip_manager_->ShowTooltip(&view);
- EXPECT_FALSE(tooltip_manager_->IsVisible());
- tooltip_manager_->ShowTooltipWithDelay(&view);
- EXPECT_FALSE(IsTimerRunning());
-
- // The manager should start the timer for a view on the shelf.
- ShelfModel* model = shelf_view_->model();
- ShelfItem item;
- item.type = TYPE_APP_SHORTCUT;
- const int index = model->Add(item);
- const ShelfID id = model->items()[index].id;
- model->SetShelfItemDelegate(id,
- base::MakeUnique<TestShelfItemDelegate>(nullptr));
- // Note: There's no easy way to correlate shelf a model index/id to its view.
- tooltip_manager_->ShowTooltipWithDelay(
- shelf_view_->child_at(shelf_view_->child_count() - 1));
- EXPECT_TRUE(IsTimerRunning());
-
- // Removing the view won't stop the timer, but the tooltip shouldn't be shown.
- model->RemoveItemAt(index);
- EXPECT_TRUE(IsTimerRunning());
- RunAllPendingInMessageLoop();
- EXPECT_FALSE(IsTimerRunning());
- EXPECT_FALSE(tooltip_manager_->IsVisible());
-}
-
-TEST_F(ShelfTooltipManagerTest, HideWhenShelfIsHidden) {
- tooltip_manager_->ShowTooltip(shelf_view_->GetAppListButton());
- ASSERT_TRUE(tooltip_manager_->IsVisible());
-
- // Create a full-screen window to hide the shelf.
- std::unique_ptr<views::Widget> widget = CreateTestWidget();
- widget->SetFullscreen(true);
-
- // Once the shelf is hidden, the tooltip should be invisible.
- ASSERT_EQ(SHELF_HIDDEN, GetPrimaryShelf()->GetVisibilityState());
- EXPECT_FALSE(tooltip_manager_->IsVisible());
-
- // Do not show the view if the shelf is hidden.
- tooltip_manager_->ShowTooltip(shelf_view_->GetAppListButton());
- EXPECT_FALSE(tooltip_manager_->IsVisible());
-
- // ShowTooltipWithDelay doesn't even start the timer for the hidden shelf.
- tooltip_manager_->ShowTooltipWithDelay(shelf_view_->GetAppListButton());
- EXPECT_FALSE(IsTimerRunning());
-}
-
-TEST_F(ShelfTooltipManagerTest, HideWhenShelfIsAutoHideHidden) {
- // Create a visible window so auto-hide behavior can actually hide the shelf.
- std::unique_ptr<views::Widget> widget = CreateTestWidget();
- tooltip_manager_->ShowTooltip(shelf_view_->GetAppListButton());
- ASSERT_TRUE(tooltip_manager_->IsVisible());
-
- GetPrimaryShelf()->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
- GetPrimaryShelf()->UpdateAutoHideState();
- ASSERT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS,
- GetPrimaryShelf()->auto_hide_behavior());
- ASSERT_EQ(SHELF_AUTO_HIDE_HIDDEN, GetPrimaryShelf()->GetAutoHideState());
-
- // Tooltip visibility change for auto hide may take time.
- EXPECT_TRUE(tooltip_manager_->IsVisible());
- RunAllPendingInMessageLoop();
- EXPECT_FALSE(tooltip_manager_->IsVisible());
-
- // Do not show the view if the shelf is hidden.
- tooltip_manager_->ShowTooltip(shelf_view_->GetAppListButton());
- EXPECT_FALSE(tooltip_manager_->IsVisible());
-
- // ShowTooltipWithDelay doesn't even run the timer for the hidden shelf.
- tooltip_manager_->ShowTooltipWithDelay(shelf_view_->GetAppListButton());
- EXPECT_FALSE(IsTimerRunning());
-
- // Close the window to show the auto-hide shelf; tooltips should now show.
- widget.reset();
- GetPrimaryShelf()->UpdateAutoHideState();
- ASSERT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS,
- GetPrimaryShelf()->auto_hide_behavior());
- ASSERT_EQ(SHELF_AUTO_HIDE_SHOWN, GetPrimaryShelf()->GetAutoHideState());
-
- // The tooltip should show for an auto-hide-shown shelf.
- tooltip_manager_->ShowTooltip(shelf_view_->GetAppListButton());
- EXPECT_TRUE(tooltip_manager_->IsVisible());
-
- // ShowTooltipWithDelay should run the timer for an auto-hide-shown shelf.
- tooltip_manager_->ShowTooltipWithDelay(shelf_view_->GetAppListButton());
- EXPECT_TRUE(IsTimerRunning());
-}
-
-TEST_F(ShelfTooltipManagerTest, HideForEvents) {
- // TODO: investigate failure in mash. http://crbug.com/695563.
- if (WmShell::Get()->IsRunningInMash())
- return;
-
- ui::test::EventGenerator& generator = GetEventGenerator();
- gfx::Rect shelf_bounds = shelf_view_->GetBoundsInScreen();
-
- // Should hide if the mouse exits the shelf area.
- tooltip_manager_->ShowTooltip(shelf_view_->GetAppListButton());
- ASSERT_TRUE(tooltip_manager_->IsVisible());
- generator.MoveMouseTo(shelf_bounds.CenterPoint());
- generator.SendMouseExit();
- EXPECT_FALSE(tooltip_manager_->IsVisible());
-
- // Should hide if the mouse is pressed in the shelf area.
- tooltip_manager_->ShowTooltip(shelf_view_->GetAppListButton());
- ASSERT_TRUE(tooltip_manager_->IsVisible());
- generator.MoveMouseTo(shelf_bounds.CenterPoint());
- generator.PressLeftButton();
- EXPECT_FALSE(tooltip_manager_->IsVisible());
-
- // Should hide for touch events in the shelf.
- tooltip_manager_->ShowTooltip(shelf_view_->GetAppListButton());
- ASSERT_TRUE(tooltip_manager_->IsVisible());
- generator.set_current_location(shelf_bounds.CenterPoint());
- generator.PressTouch();
- EXPECT_FALSE(tooltip_manager_->IsVisible());
-
- // Should hide for gesture events in the shelf.
- tooltip_manager_->ShowTooltip(shelf_view_->GetAppListButton());
- ASSERT_TRUE(tooltip_manager_->IsVisible());
- generator.GestureTapDownAndUp(shelf_bounds.CenterPoint());
- EXPECT_FALSE(tooltip_manager_->IsVisible());
-}
-
-TEST_F(ShelfTooltipManagerTest, HideForExternalEvents) {
- // TODO: investigate failure in mash. http://crbug.com/695563.
- if (WmShell::Get()->IsRunningInMash())
- return;
-
- ui::test::EventGenerator& generator = GetEventGenerator();
-
- // Should hide for touches outside the shelf.
- tooltip_manager_->ShowTooltip(shelf_view_->GetAppListButton());
- ASSERT_TRUE(tooltip_manager_->IsVisible());
- generator.set_current_location(gfx::Point());
- generator.PressTouch();
- EXPECT_FALSE(tooltip_manager_->IsVisible());
- generator.ReleaseTouch();
-
- // Should hide for touch events on the tooltip.
- tooltip_manager_->ShowTooltip(shelf_view_->GetAppListButton());
- ASSERT_TRUE(tooltip_manager_->IsVisible());
- generator.set_current_location(
- GetTooltip()->GetWindowBoundsInScreen().CenterPoint());
- generator.PressTouch();
- EXPECT_FALSE(tooltip_manager_->IsVisible());
- generator.ReleaseTouch();
-
- // Should hide for gestures outside the shelf.
- tooltip_manager_->ShowTooltip(shelf_view_->GetAppListButton());
- ASSERT_TRUE(tooltip_manager_->IsVisible());
- generator.GestureTapDownAndUp(gfx::Point());
- EXPECT_FALSE(tooltip_manager_->IsVisible());
-}
-
-TEST_F(ShelfTooltipManagerTest, DoNotHideForKeyEvents) {
- ui::test::EventGenerator& generator = GetEventGenerator();
-
- // Should not hide for key events.
- tooltip_manager_->ShowTooltip(shelf_view_->GetAppListButton());
- ASSERT_TRUE(tooltip_manager_->IsVisible());
- generator.PressKey(ui::VKEY_A, ui::EF_NONE);
- EXPECT_TRUE(tooltip_manager_->IsVisible());
-}
-
-} // namespace test
-} // namespace ash
« no previous file with comments | « ash/common/shelf/shelf_tooltip_manager.cc ('k') | ash/common/shelf/shelf_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698