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

Unified Diff: ui/events/x/device_data_manager_x11_unittest.cc

Issue 618283003: Adds special support to the device manager for keyboards devices. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase to master. Created 6 years, 2 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/events/x/device_data_manager_x11.cc ('k') | ui/events/x/hotplug_event_handler_x11.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/x/device_data_manager_x11_unittest.cc
diff --git a/ui/events/x/device_data_manager_x11_unittest.cc b/ui/events/x/device_data_manager_x11_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..08254ea91fd2b12189ffe6f19a69ec7fb8cb950b
--- /dev/null
+++ b/ui/events/x/device_data_manager_x11_unittest.cc
@@ -0,0 +1,182 @@
+// Copyright 2014 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/events/x/device_data_manager_x11.h"
+
+#include <vector>
+
+// Generically-named #defines from Xlib that conflict with symbols in GTest.
+#undef Bool
+#undef None
+
+#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/events/device_hotplug_event_observer.h"
+#include "ui/events/input_device.h"
+#include "ui/events/input_device_event_observer.h"
+#include "ui/events/keyboard_device.h"
+#include "ui/events/touchscreen_device.h"
+
+namespace ui {
+namespace test {
+namespace {
+
+class TestInputDeviceObserver : public InputDeviceEventObserver {
+ public:
+ explicit TestInputDeviceObserver(DeviceDataManagerX11* manager)
+ : manager_(manager), change_notified_(false) {
+ if (manager_)
+ manager_->AddObserver(this);
+ }
+
+ virtual ~TestInputDeviceObserver() {
+ if (manager_)
+ manager_->RemoveObserver(this);
+ }
+
+ // InputDeviceEventObserver implementation.
+ virtual void OnTouchscreenDeviceConfigurationChanged() override {}
+ virtual void OnKeyboardDeviceConfigurationChanged() override {
+ change_notified_ = true;
+ }
+
+ int change_notified() const { return change_notified_; }
+ void Reset() { change_notified_ = false; }
+
+ private:
+ DeviceDataManager* manager_;
+ bool change_notified_;
+
+ DISALLOW_COPY_AND_ASSIGN(TestInputDeviceObserver);
+};
+
+} // namespace
+
+class DeviceDataManagerX11Test : public testing::Test {
+ public:
+ DeviceDataManagerX11Test() {}
+ virtual ~DeviceDataManagerX11Test() {}
+
+ virtual void SetUp() override { DeviceDataManagerX11::CreateInstance(); }
+
+ virtual void TearDown() override {
+ SetKeyboardDevices(std::vector<KeyboardDevice>());
+ }
+
+ virtual void SetKeyboardDevices(const std::vector<KeyboardDevice>& devices) {
+ DeviceHotplugEventObserver* manager = DeviceDataManagerX11::GetInstance();
+ manager->OnKeyboardDevicesUpdated(devices);
+ }
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(DeviceDataManagerX11Test);
+};
+
+// Tests that the the device data manager notifies observers when a device is
+// disabled and re-enabled.
+TEST_F(DeviceDataManagerX11Test, NotifyOnDisable) {
+ DeviceDataManagerX11* manager = DeviceDataManagerX11::GetInstance();
+ TestInputDeviceObserver observer(manager);
+ std::vector<ui::KeyboardDevice> keyboards;
+ keyboards.push_back(ui::KeyboardDevice(
+ 1u, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, "Keyboard"));
+ keyboards.push_back(ui::KeyboardDevice(
+ 2u, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, "Keyboard"));
+ SetKeyboardDevices(keyboards);
+ EXPECT_TRUE(observer.change_notified());
+ std::vector<KeyboardDevice> devices = manager->keyboard_devices();
+ EXPECT_EQ(keyboards.size(), devices.size());
+ observer.Reset();
+ // Disable the device, should be notified that the device list contains one
+ // less device.
+ manager->DisableDevice(2u);
+ EXPECT_TRUE(observer.change_notified());
+ devices = manager->keyboard_devices();
+ EXPECT_EQ(1u, devices.size());
+ KeyboardDevice device = devices.front();
+ EXPECT_EQ(1u, device.id);
+ observer.Reset();
+ // Reenable the device, should be notified that the device list contains one
+ // more device.
+ manager->EnableDevice(2u);
+ EXPECT_TRUE(observer.change_notified());
+ devices = manager->keyboard_devices();
+ EXPECT_EQ(keyboards.size(), devices.size());
+}
+
+// Tests blocking multiple devices.
+TEST_F(DeviceDataManagerX11Test, TestMultipleDisable) {
+ DeviceDataManagerX11* manager = DeviceDataManagerX11::GetInstance();
+ TestInputDeviceObserver observer(manager);
+ std::vector<ui::KeyboardDevice> keyboards;
+ keyboards.push_back(ui::KeyboardDevice(
+ 1u, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, "Keyboard"));
+ keyboards.push_back(ui::KeyboardDevice(
+ 2u, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, "Keyboard"));
+ SetKeyboardDevices(keyboards);
+ EXPECT_TRUE(observer.change_notified());
+ std::vector<KeyboardDevice> devices = manager->keyboard_devices();
+ EXPECT_EQ(keyboards.size(), devices.size());
+ observer.Reset();
+ // Disable the device, should be notified that the device list contains one
+ // less device.
+ manager->DisableDevice(1u);
+ EXPECT_TRUE(observer.change_notified());
+ devices = manager->keyboard_devices();
+ EXPECT_EQ(1u, devices.size());
+ observer.Reset();
+ // Disable the second device, should be notified that the device list empty.
+ manager->DisableDevice(2u);
+ EXPECT_TRUE(observer.change_notified());
+ devices = manager->keyboard_devices();
+ EXPECT_EQ(0u, devices.size());
+ observer.Reset();
+ // Enable the first device, should be notified that one device present.
+ manager->EnableDevice(1u);
+ EXPECT_TRUE(observer.change_notified());
+ devices = manager->keyboard_devices();
+ EXPECT_EQ(1u, devices.size());
+ observer.Reset();
+ // Enable the second device, should be notified that both devices present.
+ manager->EnableDevice(2u);
+ EXPECT_TRUE(observer.change_notified());
+ devices = manager->keyboard_devices();
+ EXPECT_EQ(2u, devices.size());
+}
+
+TEST_F(DeviceDataManagerX11Test, UnblockOnDeviceUnplugged) {
+ DeviceDataManagerX11* manager = DeviceDataManagerX11::GetInstance();
+ TestInputDeviceObserver observer(manager);
+ std::vector<ui::KeyboardDevice> all_keyboards;
+ all_keyboards.push_back(ui::KeyboardDevice(
+ 1u, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, "Keyboard"));
+ all_keyboards.push_back(ui::KeyboardDevice(
+ 2u, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, "Keyboard"));
+ SetKeyboardDevices(all_keyboards);
+ EXPECT_TRUE(observer.change_notified());
+ std::vector<KeyboardDevice> devices = manager->keyboard_devices();
+ EXPECT_EQ(all_keyboards.size(), devices.size());
+ observer.Reset();
+ // Expect to be notified that the device is no longer available.
+ manager->DisableDevice(2u);
+ EXPECT_TRUE(observer.change_notified());
+ devices = manager->keyboard_devices();
+ EXPECT_EQ(1u, devices.size());
+ observer.Reset();
+ // Unplug the disabled device. Should not be notified, since the active list
+ // did not change.
+ std::vector<ui::KeyboardDevice> subset_keyboards;
+ subset_keyboards.push_back(ui::KeyboardDevice(
+ 1u, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, "Keyboard"));
+ SetKeyboardDevices(subset_keyboards);
+ EXPECT_FALSE(observer.change_notified());
+ // Replug in the first device. Should be notified of the new device.
+ SetKeyboardDevices(all_keyboards);
+ EXPECT_TRUE(observer.change_notified());
+ devices = manager->keyboard_devices();
+ // Both devices now present.
+ EXPECT_EQ(2u, devices.size());
+}
+
+} // namespace test
+} // namespace ui
« no previous file with comments | « ui/events/x/device_data_manager_x11.cc ('k') | ui/events/x/hotplug_event_handler_x11.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698