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

Unified Diff: ash/accelerators/accelerator_interactive_uitest.cc

Issue 1026513005: Test Accelerators In Interactive UI Tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 | « no previous file | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/accelerator_interactive_uitest.cc
diff --git a/ash/accelerators/accelerator_interactive_uitest.cc b/ash/accelerators/accelerator_interactive_uitest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..c2610450aa44446d56aad79548f06d3ca67082f2
--- /dev/null
+++ b/ash/accelerators/accelerator_interactive_uitest.cc
@@ -0,0 +1,229 @@
+// Copyright 2015 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/accelerators/accelerator_controller.h"
+
+#include "ash/shell.h"
+#include "ash/shell_observer.h"
+#include "ash/system/tray/system_tray_delegate.h"
+#include "ash/system/tray/system_tray_notifier.h"
+#include "ash/test/ash_test_base.h"
+#include "ash/test/test_screenshot_delegate.h"
+#include "ash/test/test_volume_control_delegate.h"
+#include "ash/wm/window_state.h"
+#include "ash/wm/window_util.h"
+#include "base/path_service.h"
+#include "base/run_loop.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/base/test/ui_controls.h"
+#include "ui/base/ui_base_paths.h"
+#include "ui/gl/gl_surface.h"
+
+#if defined(OS_CHROMEOS)
+#include "ash/system/chromeos/network/network_observer.h"
+#include "chromeos/network/network_handler.h"
+#endif // defined(OS_CHROMEOS)
+
+// -----------------------------------------------------------------------------
+// This file is intended to test a sample from each category of accelerators to
+// make sure they work properly. The test is done as an interactive ui test
+// using ui_controls::Send*() functions.
+// This is to catch any future regressions (crbug.com/469235).
+// -----------------------------------------------------------------------------
oshima 2015/03/24 01:33:44 you can just move this to AcceleratorInteractiveUI
afakhry 2015/03/24 01:51:20 Done.
+
+namespace ash {
+namespace test {
+
+namespace {
+
+// A network observer to watch for the toggle wifi events.
+class TestNetworkObserver : public NetworkObserver {
+ public:
+ TestNetworkObserver() : wifi_enabled_status_(false) {}
+
+ ~TestNetworkObserver() override {}
oshima 2015/03/24 01:33:44 new style guide doesn't require empty dtor. you ma
afakhry 2015/03/24 01:51:20 Done.
+
+ // ash::NetworkObserver:
+ void RequestToggleWifi() override {
+ wifi_enabled_status_ = !wifi_enabled_status_;
+ }
+
+ bool wifi_enabled_status() const { return wifi_enabled_status_; }
+
+ private:
+ bool wifi_enabled_status_;
+
+ DISALLOW_COPY_AND_ASSIGN(TestNetworkObserver);
+};
+
+} // namespace
+
+////////////////////////////////////////////////////////////////////////////////
+
+class AcceleratorInteractiveUITest : public AshTestBase, public ShellObserver {
+ public:
+ AcceleratorInteractiveUITest()
+ : network_observer_(), is_in_overview_mode_(false) {}
+
+ ~AcceleratorInteractiveUITest() override {}
+
+ void SetUp() override {
+ gfx::GLSurface::InitializeOneOffForTests();
+
+ ui::RegisterPathProvider();
+ ui::ResourceBundle::InitSharedInstanceWithLocale(
+ "en-US", NULL, ui::ResourceBundle::LOAD_COMMON_RESOURCES);
+ base::FilePath resources_pack_path;
+ PathService::Get(base::DIR_MODULE, &resources_pack_path);
+ resources_pack_path =
+ resources_pack_path.Append(FILE_PATH_LITERAL("resources.pak"));
+ ResourceBundle::GetSharedInstance().AddDataPackFromPath(
+ resources_pack_path, ui::SCALE_FACTOR_NONE);
+
+ AshTestBase::SetUp();
+
+ Shell::GetInstance()->AddShellObserver(this);
+
+#if defined(OS_CHROMEOS)
+ chromeos::NetworkHandler::Initialize();
+ Shell::GetInstance()->system_tray_notifier()->AddNetworkObserver(
+ &network_observer_);
+#endif // defined(OS_CHROMEOS)
+ }
+
+ void TearDown() override {
+ Shell::GetInstance()->RemoveShellObserver(this);
+
+#if defined(OS_CHROMEOS)
+ Shell::GetInstance()->system_tray_notifier()->RemoveNetworkObserver(
+ &network_observer_);
+ chromeos::NetworkHandler::Shutdown();
+#endif // defined(OS_CHROMEOS)
+
+ AshTestBase::TearDown();
+ }
+
+ // Sends a key press event and waits synchronously until it's completely
+ // processed.
+ void SendKeyPressSync(ui::KeyboardCode key,
+ bool control,
+ bool shift,
+ bool alt) {
+ base::RunLoop loop;
+ ui_controls::SendKeyPressNotifyWhenDone(root_window(), key, control, shift,
+ alt, false, loop.QuitClosure());
+ loop.Run();
+ }
+
+ // ash::ShellObserver:
+ void OnOverviewModeStarting() override { is_in_overview_mode_ = true; }
+ void OnOverviewModeEnded() override { is_in_overview_mode_ = false; }
+
+ Shell* shell() const { return Shell::GetInstance(); }
+ aura::Window* root_window() const { return Shell::GetPrimaryRootWindow(); }
+ bool wifi_status() const { return network_observer_.wifi_enabled_status(); }
+
+ protected:
+ TestNetworkObserver network_observer_;
+ bool is_in_overview_mode_;
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(AcceleratorInteractiveUITest);
+};
+
+////////////////////////////////////////////////////////////////////////////////
+
+// Tests a sample of the non-repeatable accelerators that need windows to be
+// enabled.
+TEST_F(AcceleratorInteractiveUITest, TestNonRepeatableNeedingWindowActions) {
+ // Create a bunch of windows to work with.
+ aura::Window* window_1 =
+ CreateTestWindowInShellWithBounds(gfx::Rect(0, 0, 100, 100));
+ aura::Window* window_2 =
+ CreateTestWindowInShellWithBounds(gfx::Rect(0, 0, 100, 100));
+ window_1->Show();
+ wm::ActivateWindow(window_1);
+ window_2->Show();
+ wm::ActivateWindow(window_2);
+
+ // Test TOGGLE_OVERVIEW.
+ EXPECT_FALSE(is_in_overview_mode_);
+ SendKeyPressSync(ui::VKEY_MEDIA_LAUNCH_APP1, false, false, false);
+ EXPECT_TRUE(is_in_overview_mode_);
+ SendKeyPressSync(ui::VKEY_MEDIA_LAUNCH_APP1, false, false, false);
+ EXPECT_FALSE(is_in_overview_mode_);
+
+ // Test CYCLE_FORWARD_MRU and CYCLE_BACKWARD_MRU.
+ wm::ActivateWindow(window_1);
+ EXPECT_TRUE(wm::IsActiveWindow(window_1));
+ EXPECT_FALSE(wm::IsActiveWindow(window_2));
+ SendKeyPressSync(ui::VKEY_TAB, false, false, true); // CYCLE_FORWARD_MRU.
+ EXPECT_TRUE(wm::IsActiveWindow(window_2));
+ EXPECT_FALSE(wm::IsActiveWindow(window_1));
+ SendKeyPressSync(ui::VKEY_TAB, false, true, true); // CYCLE_BACKWARD_MRU.
+ EXPECT_TRUE(wm::IsActiveWindow(window_1));
+ EXPECT_FALSE(wm::IsActiveWindow(window_2));
+
+ // Test TOGGLE_FULLSCREEN.
+ wm::WindowState* active_window_state = wm::GetActiveWindowState();
+ EXPECT_FALSE(active_window_state->IsFullscreen());
+ SendKeyPressSync(ui::VKEY_MEDIA_LAUNCH_APP2, false, false, false);
+ EXPECT_TRUE(active_window_state->IsFullscreen());
+ SendKeyPressSync(ui::VKEY_MEDIA_LAUNCH_APP2, false, false, false);
+ EXPECT_FALSE(active_window_state->IsFullscreen());
+}
+
+#if defined(OS_CHROMEOS)
+// Tests a sample of ChromeOS specific accelerators.
+TEST_F(AcceleratorInteractiveUITest, ChromeOsAccelerators) {
+ // Test TAKE_SCREENSHOT and TAKE_PARTIAL_SCREENSHOT.
+ TestScreenshotDelegate* screenshot_delegate = GetScreenshotDelegate();
+ screenshot_delegate->set_can_take_screenshot(true);
+ EXPECT_EQ(0, screenshot_delegate->handle_take_screenshot_count());
+ SendKeyPressSync(ui::VKEY_MEDIA_LAUNCH_APP1, true, false, false);
+ EXPECT_EQ(1, screenshot_delegate->handle_take_screenshot_count());
+ SendKeyPressSync(ui::VKEY_PRINT, false, false, false);
+ EXPECT_EQ(2, screenshot_delegate->handle_take_screenshot_count());
+ SendKeyPressSync(ui::VKEY_MEDIA_LAUNCH_APP1, true, true, false);
+ EXPECT_EQ(2, screenshot_delegate->handle_take_screenshot_count());
+ // Press ESC to go out of the partial screenshot mode.
+ SendKeyPressSync(ui::VKEY_ESCAPE, false, false, false);
+
+ // Test VOLUME_MUTE, VOLUME_DOWN, and VOLUME_UP.
+ TestVolumeControlDelegate* volume_delegate = new TestVolumeControlDelegate;
+ shell()->system_tray_delegate()->SetVolumeControlDelegate(
+ scoped_ptr<VolumeControlDelegate>(volume_delegate).Pass());
+ // VOLUME_MUTE.
+ EXPECT_EQ(0, volume_delegate->handle_volume_mute_count());
+ SendKeyPressSync(ui::VKEY_VOLUME_MUTE, false, false, false);
+ EXPECT_EQ(1, volume_delegate->handle_volume_mute_count());
+ // VOLUME_DOWN.
+ EXPECT_EQ(0, volume_delegate->handle_volume_down_count());
+ SendKeyPressSync(ui::VKEY_VOLUME_DOWN, false, false, false);
+ EXPECT_EQ(1, volume_delegate->handle_volume_down_count());
+ // VOLUME_UP.
+ EXPECT_EQ(0, volume_delegate->handle_volume_up_count());
+ SendKeyPressSync(ui::VKEY_VOLUME_UP, false, false, false);
+ EXPECT_EQ(1, volume_delegate->handle_volume_up_count());
+
+ // Test TOGGLE_WIFI.
+ EXPECT_FALSE(wifi_status());
+ SendKeyPressSync(ui::VKEY_WLAN, false, false, false);
+ EXPECT_TRUE(wifi_status());
+ SendKeyPressSync(ui::VKEY_WLAN, false, false, false);
+ EXPECT_FALSE(wifi_status());
+}
+#endif // defined(OS_CHROMEOS)
+
+// Tests the app list accelerator.
+TEST_F(AcceleratorInteractiveUITest, ToggleAppList) {
+ EXPECT_FALSE(shell()->GetAppListTargetVisibility());
+ SendKeyPressSync(ui::VKEY_LWIN, false, false, false);
+ EXPECT_TRUE(shell()->GetAppListTargetVisibility());
+ SendKeyPressSync(ui::VKEY_LWIN, false, false, false);
+ EXPECT_FALSE(shell()->GetAppListTargetVisibility());
+}
+
+} // namespace test
+} // namespace ash
« no previous file with comments | « no previous file | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698