Skip to content

GitLab

T
tangled
Commit 2619a9c9 authored by Jun Mukai's avatar Jun Mukai Committed by Commit Bot
Browse files
Options

Remove DragToOverviewTest 

This is a UI performance test to measure the input latency for
dragging window/tab in tablet-mode. However it has been disabled
for a while due to flakiness.

As I revisited this, I've realized that the expected behaviors
have changed significantly due to WebUITabStrip. The test scenario
looks irrelevant at all.

It would be just okay to simply remove the entire file.

Bug: 1031526, 1028386, 1057868
Test: none
Change-Id: I3ff5663acf8b65d799ca7490ce3287005cb6efd8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2118892Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Reviewed-by: default avatarMitsuru Oshima <oshima@chromium.org>
Commit-Queue: Jun Mukai <mukai@chromium.org>
Cr-Commit-Position: refs/heads/master@{#753259}
parent fb5e6ccf
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 216 deletions
chrome/browser/ui/ash/drag_to_overview_interactive_uitest.cc deleted 100644 → 0
View file @ fb5e6ccf
// Copyright 2019 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/public/cpp/ash_switches.h"
#include "ash/public/cpp/test/shell_test_api.h"
#include "base/bind.h"
#include "base/macros.h"
#include "base/run_loop.h"
#include "base/threading/thread_task_runner_handle.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/views/frame/browser_view.h"
#include "chrome/browser/ui/views/tabs/tab_drag_controller.h"
#include "chrome/browser/ui/views/tabs/tab_strip.h"
#include "chrome/test/base/interactive_test_utils.h"
#include "chrome/test/base/perf/performance_test.h"
#include "content/public/browser/notification_service.h"
#include "content/public/test/test_utils.h"
#include "services/service_manager/public/cpp/connector.h"
#include "ui/aura/window.h"
#include "ui/base/test/ui_controls.h"
#include "ui/compositor/compositor.h"
#include "ui/display/display.h"
#include "ui/display/screen.h"
#include "ui/gfx/geometry/vector2d.h"
#include "ui/views/widget/widget.h"
namespace {
int GetDetachY(TabStrip* tab_strip) {
return std::max(TabDragController::kTouchVerticalDetachMagnetism,
TabDragController::kVerticalDetachMagnetism) +
tab_strip->height() + 1;
}
// Waits for the primary display to present a frame after the object is
// constructed.
class NextFrameWaiter {
public:
NextFrameWaiter() {
ash::ShellTestApi().WaitForNextFrame(base::BindOnce(
&NextFrameWaiter::OnFramePresented, base::Unretained(this)));
}
~NextFrameWaiter() { EXPECT_TRUE(frame_presented_); }
void WaitForDisplay() {
if (!frame_presented_) {
run_loop_ = std::make_unique<base::RunLoop>(
base::RunLoop::Type::kNestableTasksAllowed);
run_loop_->Run();
EXPECT_TRUE(frame_presented_);
}
}
private:
void OnFramePresented() {
frame_presented_ = true;
if (run_loop_)
run_loop_->Quit();
}
bool frame_presented_ = false;
std::unique_ptr<base::RunLoop> run_loop_;
DISALLOW_COPY_AND_ASSIGN(NextFrameWaiter);
};
} // namespace
class DragToOverviewTest : public UIPerformanceTest {
public:
DragToOverviewTest() = default;
~DragToOverviewTest() override = default;
// UIPerformanceTest:
void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitch(ash::switches::kAshEnableTabletMode);
}
void SetUpOnMainThread() override {
UIPerformanceTest::SetUpOnMainThread();
ash::ShellTestApi().SetTabletModeEnabledForTest(true);
if (base::SysInfo::IsRunningOnChromeOS()) {
base::RunLoop run_loop;
base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
FROM_HERE, run_loop.QuitClosure(), base::TimeDelta::FromSeconds(5));
run_loop.Run();
}
}
std::vector<std::string> GetUMAHistogramNames() const override {
if (tab_drag_test_) {
return {"Ash.SwipeDownDrag.Tab.PresentationTime.TabletMode",
"Ash.SwipeDownDrag.Tab.PresentationTime.MaxLatency.TabletMode"};
}
return {
"Ash.SwipeDownDrag.Window.PresentationTime.TabletMode",
"Ash.SwipeDownDrag.Window.PresentationTime.MaxLatency.TabletMode",
};
}
// Continue a drag by perform |count| steps mouse dragging with each step move
// |delta|, then moue up.
void ContinueDrag(const gfx::Point& start_position,
const gfx::Vector2d& delta,
int count) {
gfx::Point drag_position = start_position;
for (int i = 0; i < count; ++i) {
drag_position += delta;
ash::ShellTestApi().WaitForNoPointerHoldLock();
NextFrameWaiter waiter;
ASSERT_TRUE(
ui_controls::SendMouseMove(drag_position.x(), drag_position.y()));
waiter.WaitForDisplay();
}
{
NextFrameWaiter waiter;
ASSERT_TRUE(
ui_controls::SendMouseEvents(ui_controls::LEFT, ui_controls::UP));
waiter.WaitForDisplay();
}
}
void VerifyTabDetachedAndContinueDrag(const gfx::Point& start_position,
const gfx::Vector2d delta,
int count) {
// Tab should be detached to create a new browser window.
EXPECT_EQ(2u, BrowserList::GetInstance()->size());
EXPECT_TRUE(TabDragController::IsActive());
ContinueDrag(start_position, delta, count);
}
void set_tab_drag_test(bool tab_drag_test) { tab_drag_test_ = tab_drag_test; }
private:
bool tab_drag_test_ = false;
DISALLOW_COPY_AND_ASSIGN(DragToOverviewTest);
};
// TODO(https://crbug.com/1031526) flaky test
IN_PROC_BROWSER_TEST_F(DragToOverviewTest, DISABLED_DragWindow) {
BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser());
aura::Window* browser_window = browser_view->GetWidget()->GetNativeWindow();
gfx::Rect browser_screen_bounds = browser_window->GetBoundsInScreen();
const gfx::Point start_position(
browser_screen_bounds.CenterPoint().x(),
browser_screen_bounds.y() + browser_view->GetTabStripHeight() / 2);
ash::ShellTestApi().WaitForNoPointerHoldLock();
ASSERT_TRUE(
ui_test_utils::SendMouseMoveSync(start_position) &&
ui_test_utils::SendMouseEventsSync(ui_controls::LEFT, ui_controls::DOWN));
// One more mouse move to start drag.
ASSERT_TRUE(ui_test_utils::SendMouseMoveSync(start_position));
// Drag 25% of the work area height.
const int drag_length = display::Screen::GetScreen()
->GetDisplayNearestWindow(browser_window)
.work_area_size()
.height() /
4;
constexpr int kSteps = 20;
gfx::Vector2d delta(0, drag_length / kSteps);
ContinueDrag(start_position, delta, kSteps);
EXPECT_TRUE(ash::ShellTestApi().IsOverviewSelecting());
}
// TODO(http://crbug.com/1028386): Test flakily fails.
IN_PROC_BROWSER_TEST_F(DragToOverviewTest, DISABLED_DragTab) {
set_tab_drag_test(true);
BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser());
aura::Window* browser_window = browser_view->GetWidget()->GetNativeWindow();
AddBlankTabAndShow(browser());
browser_view->tabstrip()->StopAnimating(true);
gfx::Point drag_position(ui_test_utils::GetCenterInScreenCoordinates(
browser_view->tabstrip()->tab_at(0)));
ash::ShellTestApi().WaitForNoPointerHoldLock();
ASSERT_TRUE(
ui_test_utils::SendMouseMoveSync(drag_position) &&
ui_test_utils::SendMouseEventsSync(ui_controls::LEFT, ui_controls::DOWN));
// Drag 25% of the work area height.
const int drag_length = display::Screen::GetScreen()
->GetDisplayNearestWindow(browser_window)
.work_area_size()
.height() /
4;
constexpr int kSteps = 20;
gfx::Vector2d delta(0, drag_length / kSteps);
// Drag tab far enough to detach.
ash::ShellTestApi().WaitForNoPointerHoldLock();
drag_position.Offset(0, GetDetachY(browser_view->tabstrip()));
ui_controls::SendMouseMoveNotifyWhenDone(
drag_position.x(), drag_position.y(),
base::BindOnce(&DragToOverviewTest::VerifyTabDetachedAndContinueDrag,
base::Unretained(this), drag_position, delta, kSteps));
// Wait for the drag to finish.
content::WindowedNotificationObserver(
chrome::NOTIFICATION_TAB_DRAG_LOOP_DONE,
content::NotificationService::AllSources())
.Wait();
}
chrome/test/BUILD.gn
View file @ 2619a9c9
...@@ -5938,7 +5938,6 @@ if (!is_android) { ...@@ -5938,7 +5938,6 @@ if (!is_android) {
# excluded from builds with sanitizer. See https://crbug.com/1057868. # excluded from builds with sanitizer. See https://crbug.com/1057868.
if (!using_sanitizer) { if (!using_sanitizer) {
sources += [ sources += [
"../browser/ui/ash/drag_to_overview_interactive_uitest.cc",
"../browser/ui/ash/homescreen_interactive_uitest.cc", "../browser/ui/ash/homescreen_interactive_uitest.cc",
"../browser/ui/ash/launcher_animations_interactive_uitest.cc", "../browser/ui/ash/launcher_animations_interactive_uitest.cc",
"../browser/ui/ash/launcher_drag_interactive_uitest.cc", "../browser/ui/ash/launcher_drag_interactive_uitest.cc",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment