From 76a798992aad321e390aee0ac6b7baaddb33047c Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Tue, 22 Aug 2023 15:53:04 +0200 Subject: [PATCH] UnitTests: Merge MockListModelEditorView into AbstractViewMock It was an AbstractView mock too. Change-Id: Ida971a3468df1b14b1f8bd900817ff9fe74e0767 Reviewed-by: Reviewed-by: Qt CI Patch Build Bot Reviewed-by: Tim Jenssen --- tests/unit/tests/mocks/CMakeLists.txt | 1 - tests/unit/tests/mocks/abstractviewmock.h | 42 ++++++++++++++ .../tests/mocks/mocklistmodeleditorview.h | 56 ------------------- .../listmodeleditor/listmodeleditor-test.cpp | 6 +- .../unit/tests/unittests/model/model-test.cpp | 4 +- .../model/modelresourcemanagement-test.cpp | 4 +- 6 files changed, 49 insertions(+), 64 deletions(-) delete mode 100644 tests/unit/tests/mocks/mocklistmodeleditorview.h diff --git a/tests/unit/tests/mocks/CMakeLists.txt b/tests/unit/tests/mocks/CMakeLists.txt index 91a45acab0c..5323f09e407 100644 --- a/tests/unit/tests/mocks/CMakeLists.txt +++ b/tests/unit/tests/mocks/CMakeLists.txt @@ -11,7 +11,6 @@ add_qtc_library(TestMocks OBJECT imagecachecollectormock.h mockimagecachegenerator.h mockimagecachestorage.h - mocklistmodeleditorview.h mockmutex.h mockqfilesystemwatcher.h mocksqlitestatement.h diff --git a/tests/unit/tests/mocks/abstractviewmock.h b/tests/unit/tests/mocks/abstractviewmock.h index c3a3be581cb..ed97e7e443c 100644 --- a/tests/unit/tests/mocks/abstractviewmock.h +++ b/tests/unit/tests/mocks/abstractviewmock.h @@ -7,6 +7,8 @@ #include +#include + class AbstractViewMock : public QmlDesigner::AbstractView { public: @@ -14,4 +16,44 @@ public: : QmlDesigner::AbstractView{*externalDependencies} {} MOCK_METHOD(void, nodeOrderChanged, (const QmlDesigner::NodeListProperty &listProperty), (override)); + MOCK_METHOD(void, + variantPropertiesChanged, + (const QList &propertyList, + PropertyChangeFlags propertyChange), + (override)); + MOCK_METHOD(void, nodeCreated, (const QmlDesigner::ModelNode &createdNode), (override)); + MOCK_METHOD(void, + nodeReparented, + (const QmlDesigner::ModelNode &node, + const QmlDesigner::NodeAbstractProperty &newPropertyParent, + const QmlDesigner::NodeAbstractProperty &oldPropertyParent, + AbstractView::PropertyChangeFlags propertyChange), + (override)); + + MOCK_METHOD(void, + propertiesRemoved, + (const QList &propertyList), + (override)); + MOCK_METHOD(void, + propertiesAboutToBeRemoved, + (const QList &propertyList), + (override)); + + MOCK_METHOD(void, + bindingPropertiesChanged, + (const QList &propertyList, + PropertyChangeFlags propertyChange), + (override)); + MOCK_METHOD(void, + bindingPropertiesAboutToBeChanged, + (const QList &propertyList), + (override)); + + MOCK_METHOD(void, + nodeRemoved, + (const QmlDesigner::ModelNode &removedNode, + const QmlDesigner::NodeAbstractProperty &parentProperty, + AbstractView::PropertyChangeFlags propertyChange), + (override)); + MOCK_METHOD(void, nodeAboutToBeRemoved, (const QmlDesigner::ModelNode &removedNode), (override)); }; diff --git a/tests/unit/tests/mocks/mocklistmodeleditorview.h b/tests/unit/tests/mocks/mocklistmodeleditorview.h deleted file mode 100644 index df228dcf2f7..00000000000 --- a/tests/unit/tests/mocks/mocklistmodeleditorview.h +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright (C) 2020 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#pragma once - -#include "../utils/googletest.h" - -#include - -class MockListModelEditorView : public QmlDesigner::AbstractView -{ -public: - MockListModelEditorView(QmlDesigner::ExternalDependenciesInterface *externalDependencies = nullptr) - : AbstractView{*externalDependencies} - {} - MOCK_METHOD(void, - variantPropertiesChanged, - (const QList &propertyList, - PropertyChangeFlags propertyChange), - (override)); - MOCK_METHOD(void, nodeCreated, (const QmlDesigner::ModelNode &createdNode), (override)); - MOCK_METHOD(void, - nodeReparented, - (const QmlDesigner::ModelNode &node, - const QmlDesigner::NodeAbstractProperty &newPropertyParent, - const QmlDesigner::NodeAbstractProperty &oldPropertyParent, - AbstractView::PropertyChangeFlags propertyChange), - (override)); - - MOCK_METHOD(void, - propertiesRemoved, - (const QList &propertyList), - (override)); - MOCK_METHOD(void, - propertiesAboutToBeRemoved, - (const QList &propertyList), - (override)); - - MOCK_METHOD(void, - bindingPropertiesChanged, - (const QList &propertyList, - PropertyChangeFlags propertyChange), - (override)); - MOCK_METHOD(void, - bindingPropertiesAboutToBeChanged, - (const QList &propertyList), - (override)); - - MOCK_METHOD(void, - nodeRemoved, - (const QmlDesigner::ModelNode &removedNode, - const QmlDesigner::NodeAbstractProperty &parentProperty, - AbstractView::PropertyChangeFlags propertyChange), - (override)); - MOCK_METHOD(void, nodeAboutToBeRemoved, (const QmlDesigner::ModelNode &removedNode), (override)); -}; diff --git a/tests/unit/tests/unittests/listmodeleditor/listmodeleditor-test.cpp b/tests/unit/tests/unittests/listmodeleditor/listmodeleditor-test.cpp index bc05c0056c6..f8bef106acf 100644 --- a/tests/unit/tests/unittests/listmodeleditor/listmodeleditor-test.cpp +++ b/tests/unit/tests/unittests/listmodeleditor/listmodeleditor-test.cpp @@ -3,7 +3,7 @@ #include "../utils/googletest.h" -#include +#include #include #include @@ -193,7 +193,7 @@ protected: {QmlDesigner::Import::createLibraryImport("QtQml.Models"), QmlDesigner::Import::createLibraryImport("QtQuick")}, pathCacheMock.path.toQString())}; - NiceMock mockView; + NiceMock mockView; QmlDesigner::ListModelEditorModel model{[&] { return mockView.createModelNode("ListModel"); }, [&] { return mockView.createModelNode("ListElement"); }, goIntoComponentMock.AsStdFunction()}; @@ -209,7 +209,7 @@ protected: {QmlDesigner::Import::createLibraryImport("QtQml.Models"), QmlDesigner::Import::createLibraryImport("QtQuick")}, pathCacheMock.path.toQString())}; - NiceMock mockComponentView; + NiceMock mockComponentView; ModelNode componentElement; }; diff --git a/tests/unit/tests/unittests/model/model-test.cpp b/tests/unit/tests/unittests/model/model-test.cpp index 83a8d936c6d..52cc04564a8 100644 --- a/tests/unit/tests/unittests/model/model-test.cpp +++ b/tests/unit/tests/unittests/model/model-test.cpp @@ -4,7 +4,7 @@ #include "../utils/googletest.h" #include -#include +#include #include #include #include @@ -77,7 +77,7 @@ protected: } protected: - NiceMock viewMock; + NiceMock viewMock; NiceMock pathCacheMock{"/path/foo.qml"}; NiceMock projectStorageMock{pathCacheMock.sourceId}; NiceMock resourceManagementMock; diff --git a/tests/unit/tests/unittests/model/modelresourcemanagement-test.cpp b/tests/unit/tests/unittests/model/modelresourcemanagement-test.cpp index 38f4a5591bb..40b94f872d5 100644 --- a/tests/unit/tests/unittests/model/modelresourcemanagement-test.cpp +++ b/tests/unit/tests/unittests/model/modelresourcemanagement-test.cpp @@ -3,7 +3,7 @@ #include "../../utils/googletest.h" -#include "../mocks/mocklistmodeleditorview.h" +#include "../mocks/abstractviewmock.h" #include "../mocks/modelresourcemanagementmock.h" #include "../mocks/projectstoragemock.h" #include "../mocks/sourcepathcachemock.h" @@ -70,7 +70,7 @@ protected: } protected: - NiceMock viewMock; + NiceMock viewMock; NiceMock pathCacheMock{"/path/foo.qml"}; NiceMock projectStorageMock{pathCacheMock.sourceId}; QmlDesigner::ModelResourceManagement management;