Merge pull request #25595 from Eism/update_framework_for_tests

A few changes to allow testing of controllers

src/framework/actions/CMakeLists.txt

@@ -36,3 +36,7 @@ set(MODULE_SRC
     )
 
 setup_module()
+
+if (MUSE_MODULE_ACTIONS_TESTS)
+    add_subdirectory(tests)
+endif()

src/framework/actions/tests/CMakeLists.txt

@@ -0,0 +1,33 @@
+# SPDX-License-Identifier: GPL-3.0-only
+# MuseScore-CLA-applies
+#
+# MuseScore
+# Music Composition & Notation
+#
+# Copyright (C) 2021 MuseScore BVBA and others
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+set(MODULE_TEST muse_actions_tests)
+
+set(MODULE_TEST_SRC
+    ${CMAKE_CURRENT_LIST_DIR}/mocks/actionsdispatchermock.h
+)
+
+set(MODULE_TEST_LINK
+    muse::actions
+    )
+
+set(MODULE_TEST_DATA_ROOT ${CMAKE_CURRENT_LIST_DIR})
+
+include(SetupGTest)

src/framework/actions/tests/mocks/actionsdispatchermock.h

@@ -0,0 +1,40 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0-only
+ * MuseScore-CLA-applies
+ *
+ * MuseScore
+ * Music Composition & Notation
+ *
+ * Copyright (C) 2021 MuseScore BVBA and others
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include <gmock/gmock.h>
+
+#include "actions/iactionsdispatcher.h"
+
+namespace muse::actions {
+class ActionsDispatcherMock : public IActionsDispatcher
+{
+public:
+    MOCK_METHOD(void, dispatch, (const ActionCode&), (override));
+    MOCK_METHOD(void, dispatch, (const ActionCode&, const ActionData&), (override));
+
+    MOCK_METHOD(void, unReg, (Actionable*), (override));
+    MOCK_METHOD(void, reg, (Actionable*, const ActionCode&, const ActionCallBackWithNameAndData&), (override));
+    MOCK_METHOD(bool, isReg, (Actionable*), (const, override));
+    MOCK_METHOD(ActionCodeList, actionList, (), (const, override));
+};
+}

src/framework/global/iapplication.h

@@ -69,6 +69,8 @@ class IApplication : MODULE_EXPORT_INTERFACE
 #ifndef NO_QT_SUPPORT
     virtual QWindow* focusWindow() const = 0;
     virtual bool notify(QObject* object, QEvent* event) = 0;
+
+    virtual Qt::KeyboardModifiers keyboardModifiers() const = 0;
 #endif
 };
 }

src/framework/global/internal/baseapplication.cpp

@@ -147,6 +147,11 @@ bool BaseApplication::notify(QObject* object, QEvent* event)
     return qApp->notify(object, event);
 }
 
+Qt::KeyboardModifiers BaseApplication::keyboardModifiers() const
+{
+    return QApplication::keyboardModifiers();
+}
+
 #endif
 
 void BaseApplication::restart()

src/framework/global/internal/baseapplication.h

@@ -59,6 +59,8 @@ class BaseApplication : public IApplication
 #ifndef NO_QT_SUPPORT
     QWindow* focusWindow() const override;
     bool notify(QObject* object, QEvent* event) override;
+
+    Qt::KeyboardModifiers keyboardModifiers() const override;
 #endif
 
 protected:

src/framework/global/tests/mocks/applicationmock.h

@@ -43,10 +43,13 @@ class ApplicationMock : public IApplication
     MOCK_METHOD(RunMode, runMode, (), (const, override));
     MOCK_METHOD(bool, noGui, (), (const, override));
 
+#ifndef NO_QT_SUPPORT
     MOCK_METHOD(QWindow*, focusWindow, (), (const, override));
-
     MOCK_METHOD(bool, notify, (QObject*, QEvent*), (override));
 
+    MOCK_METHOD(Qt::KeyboardModifiers, keyboardModifiers, (), (const, override));
+#endif
+
     MOCK_METHOD(void, perform, (), (override));
     MOCK_METHOD(void, finish, (), (override));
     MOCK_METHOD(void, restart, (), (override));