| Index: chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc
|
| diff --git a/chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc b/chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc
|
| new file mode 100644
|
| index 0000000000000000000000000000000000000000..c165979e15988066cb16f3060a3a85a0231dd3f8
|
| --- /dev/null
|
| +++ b/chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc
|
| @@ -0,0 +1,408 @@
|
| +// Copyright (c) 2012 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 "chrome/browser/ui/views/ash/tab_scrubber.h"
|
| +
|
| +#include "ash/display/event_transformation_handler.h"
|
| +#include "ash/shell.h"
|
| +#include "base/command_line.h"
|
| +#include "base/memory/scoped_ptr.h"
|
| +#include "base/message_loop.h"
|
| +#include "base/message_loop_proxy.h"
|
| +#include "chrome/browser/ui/browser_tabstrip.h"
|
| +#include "chrome/browser/ui/tabs/tab_strip_model.h"
|
| +#include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
|
| +#include "chrome/browser/ui/views/frame/browser_view.h"
|
| +#include "chrome/browser/ui/views/tabs/tab.h"
|
| +#include "chrome/browser/ui/views/tabs/tab_strip.h"
|
| +#include "chrome/common/chrome_switches.h"
|
| +#include "chrome/test/base/in_process_browser_test.h"
|
| +#include "chrome/test/base/ui_test_utils.h"
|
| +#include "content/public/browser/browser_thread.h"
|
| +#include "content/public/browser/notification_service.h"
|
| +#include "content/public/common/url_constants.h"
|
| +#include "content/public/test/test_utils.h"
|
| +#include "ui/aura/test/event_generator.h"
|
| +#include "ui/aura/window.h"
|
| +#include "ui/base/events/event_utils.h"
|
| +
|
| +namespace {
|
| +
|
| +class TabScrubberTest : public InProcessBrowserTest,
|
| + public TabStripModelObserver {
|
| + public:
|
| + TabScrubberTest()
|
| + : target_index_(-1) {
|
| + }
|
| +
|
| + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
| +#if defined(OS_CHROMEOS)
|
| + command_line->AppendSwitch(switches::kNaturalScrollDefault);
|
| +#endif
|
| + command_line->AppendSwitch(switches::kAshEnableTabScrubbing);
|
| + command_line->AppendSwitch(switches::kOpenAsh);
|
| + }
|
| +
|
| + virtual void SetUpOnMainThread() OVERRIDE {
|
| + TabScrubber::GetInstance()->set_activation_delay(
|
| + base::TimeDelta::FromMilliseconds(0));
|
| +
|
| + // Disable external monitor scaling of coordinates.
|
| + ash::Shell* shell = ash::Shell::GetInstance();
|
| + shell->event_transformation_handler()->set_transformation_mode(
|
| + ash::internal::EventTransformationHandler::TRANSFORM_NONE);
|
| + }
|
| +
|
| + virtual void CleanUpOnMainThread() {
|
| + browser()->tab_strip_model()->RemoveObserver(this);
|
| + }
|
| +
|
| + TabStrip* GetTabStrip(Browser* browser) {
|
| + aura::Window* window = browser->window()->GetNativeWindow();
|
| + return BrowserView::GetBrowserViewForNativeWindow(window)->tabstrip();
|
| + }
|
| +
|
| + int GetStartX(Browser* browser,
|
| + int index,
|
| + TabScrubber::Direction direction) {
|
| + return TabScrubber::GetStartPoint(
|
| + GetTabStrip(browser), index, direction).x();
|
| + }
|
| +
|
| + int GetTabCenter(Browser* browser, int index) {
|
| + return GetTabStrip(browser)->tab_at(index)->bounds().CenterPoint().x();
|
| + }
|
| +
|
| + // Sends one scroll event synchronously without initial or final
|
| + // fling events.
|
| + void SendScrubEvent(Browser* browser, int index) {
|
| + aura::Window* window = browser->window()->GetNativeWindow();
|
| + aura::RootWindow* root = window->GetRootWindow();
|
| + aura::test::EventGenerator event_generator(root, window);
|
| + int active_index = browser->tab_strip_model()->active_index();
|
| + TabScrubber::Direction direction = index < active_index ?
|
| + TabScrubber::LEFT : TabScrubber::RIGHT;
|
| + int offset = GetTabCenter(browser, index) -
|
| + GetStartX(browser, active_index, direction);
|
| + ui::ScrollEvent scroll_event(ui::ET_SCROLL,
|
| + gfx::Point(0, 0),
|
| + ui::EventTimeForNow(),
|
| + 0,
|
| + offset,
|
| + 0,
|
| + 3);
|
| + event_generator.Dispatch(&scroll_event);
|
| + }
|
| +
|
| + enum ScrubType {
|
| + EACH_TAB,
|
| + SKIP_TABS,
|
| + REPEAT_TABS,
|
| + };
|
| +
|
| + // Sends asynchronous events and waits for tab at |index| to become
|
| + // active.
|
| + void Scrub(Browser* browser, int index, ScrubType scrub_type) {
|
| + aura::Window* window = browser->window()->GetNativeWindow();
|
| + aura::RootWindow* root = window->GetRootWindow();
|
| + aura::test::EventGenerator event_generator(root, window);
|
| + event_generator.set_async(true);
|
| + activation_order_.clear();
|
| + int active_index = browser->tab_strip_model()->active_index();
|
| + ASSERT_NE(index, active_index);
|
| + ASSERT_TRUE(scrub_type != SKIP_TABS || ((index - active_index) % 2) == 0);
|
| + TabScrubber::Direction direction;
|
| + int increment;
|
| + if (index < active_index) {
|
| + direction = TabScrubber::LEFT;
|
| + increment = -1;
|
| + } else {
|
| + direction = TabScrubber::RIGHT;
|
| + increment = 1;
|
| + }
|
| + if (scrub_type == SKIP_TABS)
|
| + increment *= 2;
|
| + int last = GetStartX(browser, active_index, direction);
|
| + std::vector<gfx::Point> offsets;
|
| + for (int i = active_index + increment; i != (index + increment);
|
| + i += increment) {
|
| + int tab_center = GetTabCenter(browser, i);
|
| + offsets.push_back(gfx::Point(tab_center - last, 0));
|
| + last = GetStartX(browser, i, direction);
|
| + if (scrub_type == REPEAT_TABS) {
|
| + offsets.push_back(gfx::Point(increment, 0));
|
| + last += increment;
|
| + }
|
| + }
|
| + event_generator.ScrollSequence(gfx::Point(0, 0),
|
| + base::TimeDelta::FromMilliseconds(100),
|
| + offsets,
|
| + 3);
|
| + RunUntilTabActive(browser, index);
|
| + }
|
| +
|
| + // Sends events and waits for tab at |index| to become active
|
| + // if it's different from the currently active tab.
|
| + // If the active tab is expected to stay the same, send events
|
| + // synchronously (as we don't have anything to wait for).
|
| + void SendScrubSequence(Browser* browser, int x_offset, int index) {
|
| + aura::Window* window = browser->window()->GetNativeWindow();
|
| + aura::RootWindow* root = window->GetRootWindow();
|
| + aura::test::EventGenerator event_generator(root, window);
|
| + bool wait_for_active = false;
|
| + if (index != browser->tab_strip_model()->active_index()) {
|
| + wait_for_active = true;
|
| + event_generator.set_async(true);
|
| + }
|
| + event_generator.ScrollSequence(gfx::Point(0, 0),
|
| + ui::EventTimeForNow(),
|
| + x_offset,
|
| + 0,
|
| + 1,
|
| + 3);
|
| + if (wait_for_active)
|
| + RunUntilTabActive(browser, index);
|
| + }
|
| +
|
| + void AddTabs(Browser* browser, int num_tabs) {
|
| + TabStrip* tab_strip = GetTabStrip(browser);
|
| + for (int i = 0; i < num_tabs; ++i)
|
| + AddBlankTabAndShow(browser);
|
| + ASSERT_EQ(num_tabs + 1, browser->tab_strip_model()->count());
|
| + ASSERT_EQ(num_tabs, browser->tab_strip_model()->active_index());
|
| + tab_strip->StopAnimating(true);
|
| + ASSERT_FALSE(tab_strip->IsAnimating());
|
| + }
|
| +
|
| + // TabStripModelObserver overrides.
|
| + virtual void TabInsertedAt(content::WebContents* contents,
|
| + int index,
|
| + bool foreground) {}
|
| + virtual void TabClosingAt(TabStripModel* tab_strip_model,
|
| + content::WebContents* contents,
|
| + int index) {}
|
| + virtual void TabDetachedAt(content::WebContents* contents, int index) {}
|
| + virtual void TabDeactivated(content::WebContents* contents) {}
|
| + virtual void ActiveTabChanged(content::WebContents* old_contents,
|
| + content::WebContents* new_contents,
|
| + int index,
|
| + bool user_gesture) {
|
| + activation_order_.push_back(index);
|
| + if (index == target_index_)
|
| + quit_closure_.Run();
|
| + }
|
| +
|
| + virtual void TabSelectionChanged(TabStripModel* tab_strip_model,
|
| + const ui::ListSelectionModel& old_model) {}
|
| + virtual void TabMoved(content::WebContents* contents,
|
| + int from_index,
|
| + int to_index) {}
|
| + virtual void TabChangedAt(content::WebContents* contents,
|
| + int index,
|
| + TabChangeType change_type) {}
|
| + virtual void TabReplacedAt(TabStripModel* tab_strip_model,
|
| + content::WebContents* old_contents,
|
| + content::WebContents* new_contents,
|
| + int index) {}
|
| + virtual void TabPinnedStateChanged(content::WebContents* contents,
|
| + int index) {}
|
| + virtual void TabMiniStateChanged(content::WebContents* contents, int index) {}
|
| + virtual void TabBlockedStateChanged(content::WebContents* contents,
|
| + int index) {}
|
| + virtual void TabStripEmpty() {}
|
| + virtual void TabStripModelDeleted() {}
|
| +
|
| + // History of tab activation. Scrub() resets it.
|
| + std::vector<int> activation_order_;
|
| +
|
| + private:
|
| + void RunUntilTabActive(Browser* browser, int target) {
|
| + base::RunLoop run_loop;
|
| + quit_closure_ = content::GetQuitTaskForRunLoop(&run_loop);
|
| + browser->tab_strip_model()->AddObserver(this);
|
| + target_index_ = target;
|
| + content::RunThisRunLoop(&run_loop);
|
| + browser->tab_strip_model()->RemoveObserver(this);
|
| + target_index_ = -1;
|
| + }
|
| +
|
| + base::Closure quit_closure_;
|
| + int target_index_;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(TabScrubberTest);
|
| +};
|
| +
|
| +} // namespace
|
| +
|
| +#if defined(OS_CHROMEOS)
|
| +// Swipe a single tab in each direction.
|
| +IN_PROC_BROWSER_TEST_F(TabScrubberTest, Single) {
|
| + AddTabs(browser(), 1);
|
| +
|
| + Scrub(browser(), 0, EACH_TAB);
|
| + EXPECT_EQ(1U, activation_order_.size());
|
| + EXPECT_EQ(0, activation_order_[0]);
|
| + EXPECT_EQ(0, browser()->tab_strip_model()->active_index());
|
| +
|
| + Scrub(browser(), 1, EACH_TAB);
|
| + EXPECT_EQ(1U, activation_order_.size());
|
| + EXPECT_EQ(1, activation_order_[0]);
|
| + EXPECT_EQ(1, browser()->tab_strip_model()->active_index());
|
| +}
|
| +
|
| +// Swipe 4 tabs in each direction. Each of the tabs should become active.
|
| +IN_PROC_BROWSER_TEST_F(TabScrubberTest, Multi) {
|
| + AddTabs(browser(), 4);
|
| +
|
| + Scrub(browser(), 0, EACH_TAB);
|
| + ASSERT_EQ(4U, activation_order_.size());
|
| + EXPECT_EQ(3, activation_order_[0]);
|
| + EXPECT_EQ(2, activation_order_[1]);
|
| + EXPECT_EQ(1, activation_order_[2]);
|
| + EXPECT_EQ(0, activation_order_[3]);
|
| + EXPECT_EQ(0, browser()->tab_strip_model()->active_index());
|
| +
|
| + Scrub(browser(), 4, EACH_TAB);
|
| + ASSERT_EQ(4U, activation_order_.size());
|
| + EXPECT_EQ(1, activation_order_[0]);
|
| + EXPECT_EQ(2, activation_order_[1]);
|
| + EXPECT_EQ(3, activation_order_[2]);
|
| + EXPECT_EQ(4, activation_order_[3]);
|
| + EXPECT_EQ(4, browser()->tab_strip_model()->active_index());
|
| +}
|
| +
|
| +IN_PROC_BROWSER_TEST_F(TabScrubberTest, MultiBrowser) {
|
| + AddTabs(browser(), 1);
|
| + Scrub(browser(), 0, EACH_TAB);
|
| + EXPECT_EQ(0, browser()->tab_strip_model()->active_index());
|
| +
|
| + Browser* browser2 = CreateBrowser(browser()->profile());
|
| + browser2->window()->Activate();
|
| + ASSERT_TRUE(browser2->window()->IsActive());
|
| + ASSERT_FALSE(browser()->window()->IsActive());
|
| + AddTabs(browser2, 1);
|
| +
|
| + Scrub(browser2, 0, EACH_TAB);
|
| + EXPECT_EQ(0, browser2->tab_strip_model()->active_index());
|
| +}
|
| +
|
| +// Swipe 4 tabs in each direction with an extra swipe within each. The same
|
| +// 4 tabs should become active.
|
| +IN_PROC_BROWSER_TEST_F(TabScrubberTest, Repeated) {
|
| + AddTabs(browser(), 4);
|
| +
|
| + Scrub(browser(), 0, REPEAT_TABS);
|
| + ASSERT_EQ(4U, activation_order_.size());
|
| + EXPECT_EQ(3, activation_order_[0]);
|
| + EXPECT_EQ(2, activation_order_[1]);
|
| + EXPECT_EQ(1, activation_order_[2]);
|
| + EXPECT_EQ(0, activation_order_[3]);
|
| + EXPECT_EQ(0, browser()->tab_strip_model()->active_index());
|
| +
|
| + Scrub(browser(), 4, REPEAT_TABS);
|
| + ASSERT_EQ(4U, activation_order_.size());
|
| + EXPECT_EQ(1, activation_order_[0]);
|
| + EXPECT_EQ(2, activation_order_[1]);
|
| + EXPECT_EQ(3, activation_order_[2]);
|
| + EXPECT_EQ(4, activation_order_[3]);
|
| + EXPECT_EQ(4, browser()->tab_strip_model()->active_index());
|
| +}
|
| +
|
| +// Confirm that we get the last tab made active when we skip tabs.
|
| +// These tests have 5 total tabs. We will only received scroll events
|
| +// on tabs 0, 2 and 4.
|
| +IN_PROC_BROWSER_TEST_F(TabScrubberTest, Skipped) {
|
| + AddTabs(browser(), 4);
|
| +
|
| + Scrub(browser(), 0, SKIP_TABS);
|
| + EXPECT_EQ(2U, activation_order_.size());
|
| + EXPECT_EQ(2, activation_order_[0]);
|
| + EXPECT_EQ(0, activation_order_[1]);
|
| + EXPECT_EQ(0, browser()->tab_strip_model()->active_index());
|
| +
|
| + Scrub(browser(), 4, SKIP_TABS);
|
| + EXPECT_EQ(2U, activation_order_.size());
|
| + EXPECT_EQ(2, activation_order_[0]);
|
| + EXPECT_EQ(4, activation_order_[1]);
|
| + EXPECT_EQ(4, browser()->tab_strip_model()->active_index());
|
| +}
|
| +
|
| +// Confirm that nothing happens when the swipe is small.
|
| +IN_PROC_BROWSER_TEST_F(TabScrubberTest, NoChange) {
|
| + AddTabs(browser(), 1);
|
| +
|
| + SendScrubSequence(browser(), -1, 1);
|
| + EXPECT_EQ(1, browser()->tab_strip_model()->active_index());
|
| +
|
| + SendScrubSequence(browser(), 1, 1);
|
| + EXPECT_EQ(1, browser()->tab_strip_model()->active_index());
|
| +}
|
| +
|
| +// Confirm that very large swipes go to the beginning and and of the tabstrip.
|
| +IN_PROC_BROWSER_TEST_F(TabScrubberTest, Bounds) {
|
| + AddTabs(browser(), 1);
|
| +
|
| + SendScrubSequence(browser(), -10000, 0);
|
| + EXPECT_EQ(0, browser()->tab_strip_model()->active_index());
|
| +
|
| + SendScrubSequence(browser(), 10000, 1);
|
| + EXPECT_EQ(1, browser()->tab_strip_model()->active_index());
|
| +}
|
| +
|
| +IN_PROC_BROWSER_TEST_F(TabScrubberTest, DeleteHighlighted) {
|
| + AddTabs(browser(), 1);
|
| +
|
| + SendScrubEvent(browser(), 0);
|
| + EXPECT_TRUE(TabScrubber::GetInstance()->IsActivationPending());
|
| + browser()->tab_strip_model()->CloseWebContentsAt(0,
|
| + TabStripModel::CLOSE_NONE);
|
| + EXPECT_FALSE(TabScrubber::GetInstance()->IsActivationPending());
|
| +}
|
| +
|
| +// Delete the currently highlighted tab. Make sure the TabScrubber is aware.
|
| +IN_PROC_BROWSER_TEST_F(TabScrubberTest, DeleteBeforeHighlighted) {
|
| + AddTabs(browser(), 2);
|
| +
|
| + SendScrubEvent(browser(), 1);
|
| + EXPECT_TRUE(TabScrubber::GetInstance()->IsActivationPending());
|
| + browser()->tab_strip_model()->CloseWebContentsAt(0,
|
| + TabStripModel::CLOSE_NONE);
|
| + EXPECT_EQ(0, TabScrubber::GetInstance()->highlighted_tab());
|
| +}
|
| +
|
| +// Move the currently highlighted tab and confirm it gets tracked.
|
| +IN_PROC_BROWSER_TEST_F(TabScrubberTest, MoveHighlighted) {
|
| + AddTabs(browser(), 1);
|
| +
|
| + SendScrubEvent(browser(), 0);
|
| + EXPECT_TRUE(TabScrubber::GetInstance()->IsActivationPending());
|
| + browser()->tab_strip_model()->ToggleSelectionAt(0);
|
| + browser()->tab_strip_model()->ToggleSelectionAt(1);
|
| + browser()->tab_strip_model()->MoveSelectedTabsTo(1);
|
| + EXPECT_EQ(1, TabScrubber::GetInstance()->highlighted_tab());
|
| +}
|
| +
|
| +// Move a tab to before the highlighted one.
|
| +IN_PROC_BROWSER_TEST_F(TabScrubberTest, MoveBefore) {
|
| + AddTabs(browser(), 2);
|
| +
|
| + SendScrubEvent(browser(), 1);
|
| + EXPECT_TRUE(TabScrubber::GetInstance()->IsActivationPending());
|
| + browser()->tab_strip_model()->ToggleSelectionAt(0);
|
| + browser()->tab_strip_model()->ToggleSelectionAt(2);
|
| + browser()->tab_strip_model()->MoveSelectedTabsTo(2);
|
| + EXPECT_EQ(0, TabScrubber::GetInstance()->highlighted_tab());
|
| +}
|
| +
|
| +// Move a tab to after the highlighted one.
|
| +IN_PROC_BROWSER_TEST_F(TabScrubberTest, MoveAfter) {
|
| + AddTabs(browser(), 2);
|
| +
|
| + SendScrubEvent(browser(), 1);
|
| + EXPECT_TRUE(TabScrubber::GetInstance()->IsActivationPending());
|
| + browser()->tab_strip_model()->MoveSelectedTabsTo(0);
|
| + EXPECT_EQ(2, TabScrubber::GetInstance()->highlighted_tab());
|
| +}
|
| +
|
| +#endif // OS_CHROMEOS
|
|
|