| Index: ui/views/corewm/input_method_event_filter_unittest.cc
|
| diff --git a/ui/views/corewm/input_method_event_filter_unittest.cc b/ui/views/corewm/input_method_event_filter_unittest.cc
|
| deleted file mode 100644
|
| index 78abb756d4da3a0c4373c622de4fb496b7bb74ef..0000000000000000000000000000000000000000
|
| --- a/ui/views/corewm/input_method_event_filter_unittest.cc
|
| +++ /dev/null
|
| @@ -1,91 +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/views/corewm/input_method_event_filter.h"
|
| -
|
| -#include "testing/gtest/include/gtest/gtest.h"
|
| -#include "ui/aura/client/activation_client.h"
|
| -#include "ui/aura/client/aura_constants.h"
|
| -#include "ui/aura/window_event_dispatcher.h"
|
| -#include "ui/views/corewm/compound_event_filter.h"
|
| -#include "ui/aura/test/aura_test_base.h"
|
| -#include "ui/aura/test/event_generator.h"
|
| -#include "ui/aura/test/test_event_handler.h"
|
| -#include "ui/aura/test/test_windows.h"
|
| -
|
| -#if !defined(OS_WIN) && !defined(USE_X11)
|
| -// On platforms except Windows and X11, aura::test::EventGenerator::PressKey
|
| -// generates a key event without native_event(), which is not supported by
|
| -// ui::MockInputMethod.
|
| -#define TestInputMethodKeyEventPropagation \
|
| -DISABLED_TestInputMethodKeyEventPropagation
|
| -#endif
|
| -
|
| -namespace views {
|
| -namespace corewm {
|
| -
|
| -typedef aura::test::AuraTestBase InputMethodEventFilterTest;
|
| -
|
| -TEST_F(InputMethodEventFilterTest, TestInputMethodProperty) {
|
| - CompoundEventFilter* root_filter = new CompoundEventFilter;
|
| - root_window()->SetEventFilter(root_filter);
|
| -
|
| - InputMethodEventFilter input_method_event_filter(
|
| - host()->GetAcceleratedWidget());
|
| - root_filter->AddHandler(&input_method_event_filter);
|
| -
|
| - // Tests if InputMethodEventFilter adds a window property on its
|
| - // construction.
|
| - EXPECT_TRUE(root_window()->GetProperty(
|
| - aura::client::kRootWindowInputMethodKey));
|
| -
|
| - root_filter->RemoveHandler(&input_method_event_filter);
|
| -}
|
| -
|
| -// Tests if InputMethodEventFilter dispatches a ui::ET_TRANSLATED_KEY_* event to
|
| -// the root window.
|
| -TEST_F(InputMethodEventFilterTest, TestInputMethodKeyEventPropagation) {
|
| - CompoundEventFilter* root_filter = new CompoundEventFilter;
|
| - root_window()->SetEventFilter(root_filter);
|
| -
|
| - // Add the InputMethodEventFilter before the TestEventFilter.
|
| - InputMethodEventFilter input_method_event_filter(
|
| - host()->GetAcceleratedWidget());
|
| - root_filter->AddHandler(&input_method_event_filter);
|
| -
|
| - // Add TestEventFilter to the RootWindow.
|
| - aura::test::TestEventHandler test_filter;
|
| - root_filter->AddHandler(&test_filter);
|
| -
|
| - // We need an active window. Otherwise, the root window will not forward a key
|
| - // event to event filters.
|
| - aura::test::TestWindowDelegate test_delegate;
|
| - scoped_ptr<aura::Window> window(aura::test::CreateTestWindowWithDelegate(
|
| - &test_delegate,
|
| - -1,
|
| - gfx::Rect(),
|
| - root_window()));
|
| - aura::client::GetActivationClient(root_window())->ActivateWindow(
|
| - window.get());
|
| -
|
| - // Send a fake key event to the root window. InputMethodEventFilter, which is
|
| - // automatically set up by AshTestBase, consumes it and sends a new
|
| - // ui::ET_TRANSLATED_KEY_* event to the root window, which will be consumed by
|
| - // the test event filter.
|
| - aura::test::EventGenerator generator(root_window());
|
| - EXPECT_EQ(0, test_filter.num_key_events());
|
| - generator.PressKey(ui::VKEY_SPACE, 0);
|
| - EXPECT_EQ(1, test_filter.num_key_events());
|
| - generator.ReleaseKey(ui::VKEY_SPACE, 0);
|
| - EXPECT_EQ(2, test_filter.num_key_events());
|
| -
|
| - root_filter->RemoveHandler(&input_method_event_filter);
|
| - root_filter->RemoveHandler(&test_filter);
|
| -
|
| - // Reset window before |test_delegate| gets deleted.
|
| - window.reset();
|
| -}
|
| -
|
| -} // namespace corewm
|
| -} // namespace views
|
|
|