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

Unified Diff: ui/base/event_unittest.cc

Issue 10830166: Revert 149888 - Copy aura::Event into ui::Event. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 | « ui/base/event.cc ('k') | ui/ui.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/event_unittest.cc
===================================================================
--- ui/base/event_unittest.cc (revision 149888)
+++ ui/base/event_unittest.cc (working copy)
@@ -1,102 +0,0 @@
-// 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 "ui/base/event.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-#if defined(USE_X11)
-#include <X11/Xlib.h>
-#include "ui/base/x/x11_util.h"
-#endif
-
-namespace ui {
-
-TEST(EventTest, NoNativeEvent) {
- KeyEvent keyev(ET_KEY_PRESSED, VKEY_SPACE, 0);
- EXPECT_FALSE(keyev.HasNativeEvent());
-}
-
-TEST(EventTest, NativeEvent) {
-#if defined(OS_WIN)
- MSG native_event = { NULL, WM_KEYUP, VKEY_A, 0 };
- KeyEvent keyev(native_event, false);
- EXPECT_TRUE(keyev.HasNativeEvent());
-#elif defined(USE_X11)
- scoped_ptr<XEvent> native_event(new XEvent);
- InitXKeyEventForTesting(ET_KEY_RELEASED, VKEY_A, 0, native_event.get());
- KeyEvent keyev(native_event.get(), false);
- EXPECT_TRUE(keyev.HasNativeEvent());
-#endif
-}
-
-TEST(EventTest, MAYBE_GetCharacter) {
- // Check if Control+Enter returns 10.
- KeyEvent keyev1(ET_KEY_PRESSED, VKEY_RETURN, EF_CONTROL_DOWN);
- EXPECT_EQ(10, keyev1.GetCharacter());
- EXPECT_EQ(13, keyev1.GetUnmodifiedCharacter());
- // Check if Enter returns 13.
- KeyEvent keyev2(ET_KEY_PRESSED, VKEY_RETURN, 0);
- EXPECT_EQ(13, keyev2.GetCharacter());
- EXPECT_EQ(13, keyev2.GetUnmodifiedCharacter());
-
-#if defined(USE_X11)
- // For X11, test the functions with native_event() as well. crbug.com/107837
- scoped_ptr<XEvent> native_event(new XEvent);
-
- InitXKeyEventForTesting(ET_KEY_PRESSED, VKEY_RETURN, EF_CONTROL_DOWN,
- native_event.get());
- KeyEvent keyev3(native_event.get(), false);
- EXPECT_EQ(10, keyev3.GetCharacter());
- EXPECT_EQ(13, keyev3.GetUnmodifiedCharacter());
-
- InitXKeyEventForTesting(ET_KEY_PRESSED, VKEY_RETURN, 0, native_event.get());
- KeyEvent keyev4(native_event.get(), false);
- EXPECT_EQ(13, keyev4.GetCharacter());
- EXPECT_EQ(13, keyev4.GetUnmodifiedCharacter());
-#endif
-}
-
-TEST(EventTest, ClickCount) {
- const gfx::Point origin(0, 0);
- MouseEvent mouseev(ET_MOUSE_PRESSED, origin, origin, 0);
- for (int i = 1; i <=3 ; ++i) {
- mouseev.SetClickCount(i);
- EXPECT_EQ(i, mouseev.GetClickCount());
- }
-}
-
-TEST(EventTest, Repeated) {
- const gfx::Point origin(0, 0);
- MouseEvent mouse_ev1(ET_MOUSE_PRESSED, origin, origin, 0);
- MouseEvent mouse_ev2(ET_MOUSE_PRESSED, origin, origin, 0);
- MouseEvent::TestApi test_ev1(&mouse_ev1);
- MouseEvent::TestApi test_ev2(&mouse_ev2);
-
- base::TimeDelta start = base::TimeDelta::FromMilliseconds(0);
- base::TimeDelta soon = start + base::TimeDelta::FromMilliseconds(1);
- base::TimeDelta later = start + base::TimeDelta::FromMilliseconds(1000);
-
- // Close point.
- test_ev1.set_location(gfx::Point(0, 0));
- test_ev2.set_location(gfx::Point(1, 0));
- test_ev1.set_time_stamp(start);
- test_ev2.set_time_stamp(soon);
- EXPECT_TRUE(MouseEvent::IsRepeatedClickEvent(mouse_ev1, mouse_ev2));
-
- // Too far.
- test_ev1.set_location(gfx::Point(0, 0));
- test_ev2.set_location(gfx::Point(10, 0));
- test_ev1.set_time_stamp(start);
- test_ev2.set_time_stamp(soon);
- EXPECT_FALSE(MouseEvent::IsRepeatedClickEvent(mouse_ev1, mouse_ev2));
-
- // Too long a time between clicks.
- test_ev1.set_location(gfx::Point(0, 0));
- test_ev2.set_location(gfx::Point(0, 0));
- test_ev1.set_time_stamp(start);
- test_ev2.set_time_stamp(later);
- EXPECT_FALSE(MouseEvent::IsRepeatedClickEvent(mouse_ev1, mouse_ev2));
-}
-
-} // namespace ui
« no previous file with comments | « ui/base/event.cc ('k') | ui/ui.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698