events: Move EventTarget into Event.

ui/base/event_unittest.cc

Index: ui/base/event_unittest.cc
diff --git a/ui/base/event_unittest.cc b/ui/base/event_unittest.cc
deleted file mode 100644
index 4bdd830fe226b25f92b92198b6ac9b0f0661c052..0000000000000000000000000000000000000000
--- a/ui/base/event_unittest.cc
+++ /dev/null
@@ -1,290 +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 "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/events/event.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, 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));
-}
-
-// Bug 99129.
-#if defined(USE_AURA)
-#define MAYBE_KeyEvent FAILS_KeyEvent
-#define MAYBE_KeyEventDirectUnicode FAILS_KeyEventDirectUnicode
-#else
-#define MAYBE_KeyEvent KeyEvent
-#define MAYBE_KeyEventDirectUnicode KeyEventDirectUnicode
-#endif
-
-TEST(EventTest, MAYBE_KeyEvent) {
-  static const struct {
-    KeyboardCode key_code;
-    int flags;
-    uint16 character;
-    uint16 unmodified_character;
-  } kTestData[] = {
-    { VKEY_A, 0, 'a', 'a' },
-    { VKEY_A, EF_SHIFT_DOWN, 'A', 'A' },
-    { VKEY_A, EF_CAPS_LOCK_DOWN, 'A', 'a' },
-    { VKEY_A, EF_SHIFT_DOWN | EF_CAPS_LOCK_DOWN, 'a', 'A' },
-    { VKEY_A, EF_CONTROL_DOWN, 0x01, 'a' },
-    { VKEY_A, EF_SHIFT_DOWN | EF_CONTROL_DOWN, '\x01', 'A' },
-    { VKEY_Z, 0, 'z', 'z' },
-    { VKEY_Z, EF_SHIFT_DOWN, 'Z', 'Z' },
-    { VKEY_Z, EF_CAPS_LOCK_DOWN, 'Z', 'z' },
-    { VKEY_Z, EF_SHIFT_DOWN | EF_CAPS_LOCK_DOWN, 'z', 'Z' },
-    { VKEY_Z, EF_CONTROL_DOWN, '\x1A', 'z' },
-    { VKEY_Z, EF_SHIFT_DOWN | EF_CONTROL_DOWN, '\x1A', 'Z' },
-
-    { VKEY_2, EF_CONTROL_DOWN, '\0', '2' },
-    { VKEY_2, EF_SHIFT_DOWN | EF_CONTROL_DOWN, '\0', '@' },
-    { VKEY_6, EF_CONTROL_DOWN, '\0', '6' },
-    { VKEY_6, EF_SHIFT_DOWN | EF_CONTROL_DOWN, '\x1E', '^' },
-    { VKEY_OEM_MINUS, EF_CONTROL_DOWN, '\0', '-' },
-    { VKEY_OEM_MINUS, EF_SHIFT_DOWN | EF_CONTROL_DOWN, '\x1F', '_'},
-    { VKEY_OEM_4, EF_CONTROL_DOWN, '\x1B', '[' },
-    { VKEY_OEM_4, EF_SHIFT_DOWN | EF_CONTROL_DOWN, '\0', '{' },
-    { VKEY_OEM_5, EF_CONTROL_DOWN, '\x1C', '\\' },
-    { VKEY_OEM_5, EF_SHIFT_DOWN | EF_CONTROL_DOWN, '\0', '|' },
-    { VKEY_OEM_6, EF_CONTROL_DOWN, '\x1D', ']' },
-    { VKEY_OEM_6, EF_SHIFT_DOWN | EF_CONTROL_DOWN, '\0', '}' },
-    { VKEY_RETURN, EF_CONTROL_DOWN, '\x0A', '\r' },
-
-    { VKEY_0, 0, '0', '0' },
-    { VKEY_0, EF_SHIFT_DOWN, ')', ')' },
-    { VKEY_0, EF_SHIFT_DOWN | EF_CAPS_LOCK_DOWN, ')', ')' },
-    { VKEY_0, EF_SHIFT_DOWN | EF_CONTROL_DOWN, '\0', ')' },
-
-    { VKEY_9, 0, '9', '9' },
-    { VKEY_9, EF_SHIFT_DOWN, '(', '(' },
-    { VKEY_9, EF_SHIFT_DOWN | EF_CAPS_LOCK_DOWN, '(', '(' },
-    { VKEY_9, EF_SHIFT_DOWN | EF_CONTROL_DOWN, '\0', '(' },
-
-    { VKEY_NUMPAD0, EF_CONTROL_DOWN, '\0', '0' },
-    { VKEY_NUMPAD0, EF_SHIFT_DOWN, '0', '0' },
-
-    { VKEY_NUMPAD9, EF_CONTROL_DOWN, '\0', '9' },
-    { VKEY_NUMPAD9, EF_SHIFT_DOWN, '9', '9' },
-
-    { VKEY_TAB, EF_CONTROL_DOWN, '\0', '\t' },
-    { VKEY_TAB, EF_SHIFT_DOWN, '\t', '\t' },
-
-    { VKEY_MULTIPLY, EF_CONTROL_DOWN, '\0', '*' },
-    { VKEY_MULTIPLY, EF_SHIFT_DOWN, '*', '*' },
-    { VKEY_ADD, EF_CONTROL_DOWN, '\0', '+' },
-    { VKEY_ADD, EF_SHIFT_DOWN, '+', '+' },
-    { VKEY_SUBTRACT, EF_CONTROL_DOWN, '\0', '-' },
-    { VKEY_SUBTRACT, EF_SHIFT_DOWN, '-', '-' },
-    { VKEY_DECIMAL, EF_CONTROL_DOWN, '\0', '.' },
-    { VKEY_DECIMAL, EF_SHIFT_DOWN, '.', '.' },
-    { VKEY_DIVIDE, EF_CONTROL_DOWN, '\0', '/' },
-    { VKEY_DIVIDE, EF_SHIFT_DOWN, '/', '/' },
-
-    { VKEY_OEM_1, EF_CONTROL_DOWN, '\0', ';' },
-    { VKEY_OEM_1, EF_SHIFT_DOWN, ':', ':' },
-    { VKEY_OEM_PLUS, EF_CONTROL_DOWN, '\0', '=' },
-    { VKEY_OEM_PLUS, EF_SHIFT_DOWN, '+', '+' },
-    { VKEY_OEM_COMMA, EF_CONTROL_DOWN, '\0', ',' },
-    { VKEY_OEM_COMMA, EF_SHIFT_DOWN, '<', '<' },
-    { VKEY_OEM_PERIOD, EF_CONTROL_DOWN, '\0', '.' },
-    { VKEY_OEM_PERIOD, EF_SHIFT_DOWN, '>', '>' },
-    { VKEY_OEM_3, EF_CONTROL_DOWN, '\0', '`' },
-    { VKEY_OEM_3, EF_SHIFT_DOWN, '~', '~' },
-  };
-
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestData); ++i) {
-    KeyEvent key(ET_KEY_PRESSED, kTestData[i].key_code, kTestData[i].flags);
-    EXPECT_EQ(kTestData[i].character, key.GetCharacter())
-        << " Index:" << i << " key_code:" << kTestData[i].key_code;
-    EXPECT_EQ(kTestData[i].unmodified_character, key.GetUnmodifiedCharacter())
-        << " Index:" << i << " key_code:" << kTestData[i].key_code;
-  }
-}
-
-TEST(EventTest, MAYBE_KeyEventDirectUnicode) {
-  KeyEvent key(ET_KEY_PRESSED, VKEY_UNKNOWN, EF_SHIFT_DOWN);
-  key.set_character(0x1234U);
-  key.set_unmodified_character(0x4321U);
-  EXPECT_EQ(0x1234U, key.GetCharacter());
-  EXPECT_EQ(0x4321U, key.GetUnmodifiedCharacter());
-  KeyEvent key2(ET_KEY_RELEASED, VKEY_UNKNOWN, EF_CONTROL_DOWN);
-  key2.set_character(0x4321U);
-  key2.set_unmodified_character(0x1234U);
-  EXPECT_EQ(0x4321U, key2.GetCharacter());
-  EXPECT_EQ(0x1234U, key2.GetUnmodifiedCharacter());
-}
-
-TEST(EventTest, NormalizeKeyEventFlags) {
-#if defined(USE_X11)
-  // Normalize flags when KeyEvent is created from XEvent.
-  {
-    scoped_ptr<XEvent> native_event(new XEvent);
-    InitXKeyEventForTesting(ET_KEY_PRESSED, VKEY_SHIFT, EF_SHIFT_DOWN,
-                            native_event.get());
-    KeyEvent keyev(native_event.get(), false);
-    EXPECT_EQ(EF_SHIFT_DOWN, keyev.flags());
-  }
-  {
-    scoped_ptr<XEvent> native_event(new XEvent);
-    InitXKeyEventForTesting(ET_KEY_RELEASED, VKEY_SHIFT, EF_SHIFT_DOWN,
-                            native_event.get());
-    KeyEvent keyev(native_event.get(), false);
-    EXPECT_EQ(EF_NONE, keyev.flags());
-  }
-  {
-    scoped_ptr<XEvent> native_event(new XEvent);
-    InitXKeyEventForTesting(ET_KEY_PRESSED, VKEY_CONTROL, EF_CONTROL_DOWN,
-                            native_event.get());
-    KeyEvent keyev(native_event.get(), false);
-    EXPECT_EQ(EF_CONTROL_DOWN, keyev.flags());
-  }
-  {
-    scoped_ptr<XEvent> native_event(new XEvent);
-    InitXKeyEventForTesting(ET_KEY_RELEASED, VKEY_CONTROL, EF_CONTROL_DOWN,
-                            native_event.get());
-    KeyEvent keyev(native_event.get(), false);
-    EXPECT_EQ(EF_NONE, keyev.flags());
-  }
-  {
-    scoped_ptr<XEvent> native_event(new XEvent);
-    InitXKeyEventForTesting(ET_KEY_PRESSED, VKEY_MENU,  EF_ALT_DOWN,
-                            native_event.get());
-    KeyEvent keyev(native_event.get(), false);
-    EXPECT_EQ(EF_ALT_DOWN, keyev.flags());
-  }
-  {
-    scoped_ptr<XEvent> native_event(new XEvent);
-    InitXKeyEventForTesting(ET_KEY_RELEASED, VKEY_MENU, EF_ALT_DOWN,
-                            native_event.get());
-    KeyEvent keyev(native_event.get(), false);
-    EXPECT_EQ(EF_NONE, keyev.flags());
-  }
-#endif
-
-  // Do not normalize flags for synthesized events without
-  // KeyEvent::NormalizeFlags called explicitly.
-  {
-    KeyEvent keyev(ET_KEY_PRESSED, VKEY_SHIFT, EF_SHIFT_DOWN);
-    EXPECT_EQ(EF_SHIFT_DOWN, keyev.flags());
-  }
-  {
-    KeyEvent keyev(ET_KEY_RELEASED, VKEY_SHIFT, EF_SHIFT_DOWN);
-    EXPECT_EQ(EF_SHIFT_DOWN, keyev.flags());
-    keyev.NormalizeFlags();
-    EXPECT_EQ(EF_NONE, keyev.flags());
-  }
-  {
-    KeyEvent keyev(ET_KEY_PRESSED, VKEY_CONTROL, EF_CONTROL_DOWN);
-    EXPECT_EQ(EF_CONTROL_DOWN, keyev.flags());
-  }
-  {
-    KeyEvent keyev(ET_KEY_RELEASED, VKEY_CONTROL, EF_CONTROL_DOWN);
-    EXPECT_EQ(EF_CONTROL_DOWN, keyev.flags());
-    keyev.NormalizeFlags();
-    EXPECT_EQ(EF_NONE, keyev.flags());
-  }
-  {
-    KeyEvent keyev(ET_KEY_PRESSED, VKEY_MENU,  EF_ALT_DOWN);
-    EXPECT_EQ(EF_ALT_DOWN, keyev.flags());
-  }
-  {
-    KeyEvent keyev(ET_KEY_RELEASED, VKEY_MENU, EF_ALT_DOWN);
-    EXPECT_EQ(EF_ALT_DOWN, keyev.flags());
-    keyev.NormalizeFlags();
-    EXPECT_EQ(EF_NONE, keyev.flags());
-  }
-}
-
-}  // namespace ui