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

Unified Diff: chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc

Issue 359453003: Added accurate TouchToMouseMode testing to SplitTap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: removed extra browser test Created 6 years, 6 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
Index: chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc
diff --git a/chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc b/chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc
index 148f1f3845c312b3d1e44ef60270c76375da8da1..73f9a878d2b923109b799ebfe5eb6d29a37d2f41 100644
--- a/chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc
+++ b/chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc
@@ -12,6 +12,7 @@
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
#include "content/public/test/browser_test_utils.h"
+#include "ui/aura/client/cursor_client.h"
#include "ui/aura/test/event_generator.h"
#include "ui/aura/window_tree_host.h"
#include "ui/compositor/compositor.h"
@@ -86,4 +87,59 @@ IN_PROC_BROWSER_TEST_F(TouchExplorationTest, ToggleOnOff) {
root_window->RemovePreTargetHandler(event_handler.get());
}
+// This test makes sure that after the user clicks with split tap,
+// they continue to touch exploration mode if the original touch exploration
+// finger is still on the screen.
+IN_PROC_BROWSER_TEST_F(TouchExplorationTest, SplitTapExplore) {
+ aura::Window* root_window = ash::Shell::GetInstance()->GetPrimaryRootWindow();
mfomitchev 2014/07/03 17:31:55 I think you need to call WaitForResizeComplete(),
evy 2014/07/07 18:53:42 Done.
+ scoped_ptr<ui::test::TestEventHandler>
+ event_handler(new ui::test::TestEventHandler());
+ root_window->AddPreTargetHandler(event_handler.get());
+ SwitchTouchExplorationMode(true);
+ aura::test::EventGenerator generator(root_window);
+ aura::client::CursorClient* cursor_client =
+ aura::client::GetCursorClient(root_window);
+
+ // Mouse events should show the cursor.
+ generator.MoveMouseTo(gfx::Point(30, 31));
+ EXPECT_TRUE(cursor_client->IsMouseEventsEnabled());
+ EXPECT_TRUE(cursor_client->IsCursorVisible());
+
+ // After a press the cursor should be shown after immediately after press,
+ // hidden after move.
+ generator.set_current_location(gfx::Point(100, 200));
+ generator.PressTouchId(1);
+ EXPECT_TRUE(cursor_client->IsMouseEventsEnabled());
+ EXPECT_TRUE(cursor_client->IsCursorVisible());
+ // Initiate touch explore by moving out of the slop.
+ generator.MoveTouchId(gfx::Point(109, 209), 1);
+ EXPECT_TRUE(cursor_client->IsMouseEventsEnabled());
+ EXPECT_FALSE(cursor_client->IsCursorVisible());
+ event_handler->Reset();
+
+ // Press and release with a second finger for split tap. This should send
+ // touch press and release events which should send a click press and release.
+ // Once the press is passed through, mouse events should be disabled.
+ // Mouse events are reenabled after the release.
+ generator.set_current_location(gfx::Point(102, 202));
+ generator.PressTouchId(2);
+ EXPECT_FALSE(cursor_client->IsMouseEventsEnabled());
+ EXPECT_FALSE(cursor_client->IsCursorVisible());
+ generator.ReleaseTouchId(2);
+ EXPECT_TRUE(cursor_client->IsMouseEventsEnabled());
+ EXPECT_FALSE(cursor_client->IsCursorVisible());
+ EXPECT_EQ(2, event_handler->num_touch_events());
+ event_handler->Reset();
+
+ // Continuing to move the touch exploration finger should send more mouse
+ // events.
+ generator.MoveTouchId(gfx::Point(509, 609), 1);
+ EXPECT_EQ(0, event_handler->num_touch_events());
+ EXPECT_TRUE(cursor_client->IsMouseEventsEnabled());
+ EXPECT_FALSE(cursor_client->IsCursorVisible());
+
+ SwitchTouchExplorationMode(false);
+ root_window->RemovePreTargetHandler(event_handler.get());
+}
+
} // namespace ui
« no previous file with comments | « no previous file | ui/chromeos/touch_exploration_controller.cc » ('j') | ui/chromeos/touch_exploration_controller_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698