From 474d0344ca79b8e819a55d44515f9e5404125f06 Mon Sep 17 00:00:00 2001 From: Bhushan Shah Date: Wed, 30 Sep 2020 15:58:42 +0530 Subject: [PATCH] autotests: rename to testInputMethod Relevant class got renamed, also update the test name Related: plasma/kwin!302 --- CMakeLists.txt | 2 +- autotests/integration/CMakeLists.txt | 2 +- ...ualkeyboard_test.cpp => inputmethod_test.cpp} | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) rename autotests/integration/{virtualkeyboard_test.cpp => inputmethod_test.cpp} (95%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 57d6c53147..5d07858987 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -467,6 +467,7 @@ set(kwin_SRCS input.cpp input_event.cpp input_event_spy.cpp + inputmethod.cpp inputpanelv1client.cpp inputpanelv1integration.cpp internal_client.cpp @@ -531,7 +532,6 @@ set(kwin_SRCS utils.cpp virtualdesktops.cpp virtualdesktopsdbustypes.cpp - inputmethod.cpp virtualkeyboard_dbus.cpp was_user_interaction_x11_filter.cpp wayland_server.cpp diff --git a/autotests/integration/CMakeLists.txt b/autotests/integration/CMakeLists.txt index 3dc8880325..422fd26aac 100644 --- a/autotests/integration/CMakeLists.txt +++ b/autotests/integration/CMakeLists.txt @@ -86,7 +86,7 @@ integrationTest(WAYLAND_ONLY NAME testNoGlobalShortcuts SRCS no_global_shortcuts integrationTest(WAYLAND_ONLY NAME testBufferSizeChange SRCS buffer_size_change_test.cpp ) integrationTest(WAYLAND_ONLY NAME testPlacement SRCS placement_test.cpp) integrationTest(WAYLAND_ONLY NAME testActivation SRCS activation_test.cpp) -integrationTest(WAYLAND_ONLY NAME testVirtualKeyboard SRCS virtualkeyboard_test.cpp) +integrationTest(WAYLAND_ONLY NAME testInputMethod SRCS inputmethod_test.cpp) if (XCB_ICCCM_FOUND) integrationTest(NAME testMoveResize SRCS move_resize_window_test.cpp LIBS XCB::ICCCM) diff --git a/autotests/integration/virtualkeyboard_test.cpp b/autotests/integration/inputmethod_test.cpp similarity index 95% rename from autotests/integration/virtualkeyboard_test.cpp rename to autotests/integration/inputmethod_test.cpp index 1cc3eb1b6f..225acdc9a9 100644 --- a/autotests/integration/virtualkeyboard_test.cpp +++ b/autotests/integration/inputmethod_test.cpp @@ -40,9 +40,9 @@ using namespace KWin; using namespace KWayland::Client; using KWin::VirtualKeyboardDBus; -static const QString s_socketName = QStringLiteral("wayland_test_kwin_virtualkeyboard-0"); +static const QString s_socketName = QStringLiteral("wayland_test_kwin_inputmethod-0"); -class VirtualKeyboardTest : public QObject +class InputMethodTest : public QObject { Q_OBJECT private Q_SLOTS: @@ -55,7 +55,7 @@ private Q_SLOTS: }; -void VirtualKeyboardTest::initTestCase() +void InputMethodTest::initTestCase() { qRegisterMetaType(); qRegisterMetaType(); @@ -77,7 +77,7 @@ void VirtualKeyboardTest::initTestCase() } -void VirtualKeyboardTest::init() +void InputMethodTest::init() { QVERIFY(Test::setupWaylandConnection(Test::AdditionalWaylandInterface::Seat | Test::AdditionalWaylandInterface::TextInputManagerV2 | @@ -95,12 +95,12 @@ void VirtualKeyboardTest::init() QDBusConnection::sessionBus().call(message); } -void VirtualKeyboardTest::cleanup() +void InputMethodTest::cleanup() { Test::destroyWaylandConnection(); } -void VirtualKeyboardTest::testOpenClose() +void InputMethodTest::testOpenClose() { QSignalSpy clientAddedSpy(workspace(), &Workspace::clientAdded); QSignalSpy clientRemovedSpy(workspace(), &Workspace::clientRemoved); @@ -154,7 +154,7 @@ void VirtualKeyboardTest::testOpenClose() QVERIFY(Test::waitForWindowDestroyed(client)); } -void VirtualKeyboardTest::testEnableDisableV3() +void InputMethodTest::testEnableDisableV3() { QSignalSpy clientAddedSpy(workspace(), &Workspace::clientAdded); QSignalSpy clientRemovedSpy(workspace(), &Workspace::clientRemoved); @@ -188,6 +188,6 @@ void VirtualKeyboardTest::testEnableDisableV3() QVERIFY(clientRemovedSpy.wait()); } -WAYLANDTEST_MAIN(VirtualKeyboardTest) +WAYLANDTEST_MAIN(InputMethodTest) #include "virtualkeyboard_test.moc"