From dad1232165917a9720984f94c9de43b1292c0259 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Thu, 20 Jun 2024 15:39:37 +0200 Subject: [PATCH] UnitTests: Fix typo Change-Id: I5f5e3f208603733b173798816f2e9ada9ff39140 Reviewed-by: Miikka Heikkinen --- tests/unit/tests/mocks/projectstoragemock.h | 4 ++-- .../componentcore/propertycomponentgenerator-test.cpp | 2 +- .../componentcore/propertyeditorcomponentgenerator-test.cpp | 2 +- .../tests/unittests/listmodeleditor/listmodeleditor-test.cpp | 4 ++-- tests/unit/tests/unittests/metainfo/nodemetainfo-test.cpp | 2 +- tests/unit/tests/unittests/metainfo/propertymetainfo-test.cpp | 2 +- .../unittests/model/auxiliarypropertystorageview-test.cpp | 2 +- tests/unit/tests/unittests/model/model-test.cpp | 2 +- tests/unit/tests/unittests/model/modelnode-test.cpp | 2 +- .../tests/unittests/model/modelresourcemanagement-test.cpp | 2 +- tests/unit/tests/unittests/model/modelutils-test.cpp | 2 +- tests/unit/tests/unittests/model/nodelistproperty-test.cpp | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/unit/tests/mocks/projectstoragemock.h b/tests/unit/tests/mocks/projectstoragemock.h index ed60f7b5cf4..1849578d3b6 100644 --- a/tests/unit/tests/mocks/projectstoragemock.h +++ b/tests/unit/tests/mocks/projectstoragemock.h @@ -364,10 +364,10 @@ public: exportedTypeNameBySourceId; }; -class ProjectStorageMockWithQtQtuick : public ProjectStorageMock +class ProjectStorageMockWithQtQuick : public ProjectStorageMock { public: - ProjectStorageMockWithQtQtuick(QmlDesigner::SourceId sourceId, + ProjectStorageMockWithQtQuick(QmlDesigner::SourceId sourceId, Utils::SmallStringView localPathModuleName) { createModule(localPathModuleName, QmlDesigner::Storage::ModuleKind::PathLibrary); diff --git a/tests/unit/tests/unittests/componentcore/propertycomponentgenerator-test.cpp b/tests/unit/tests/unittests/componentcore/propertycomponentgenerator-test.cpp index 4358aa0de71..154883cecb2 100644 --- a/tests/unit/tests/unittests/componentcore/propertycomponentgenerator-test.cpp +++ b/tests/unit/tests/unittests/componentcore/propertycomponentgenerator-test.cpp @@ -172,7 +172,7 @@ protected: inline static QSharedPointer simpleReaderNode; NiceMock viewMock; NiceMock pathCacheMock{"/path/foo.qml"}; - NiceMock projectStorageMock{pathCacheMock.sourceId, "/path"}; + NiceMock projectStorageMock{pathCacheMock.sourceId, "/path"}; NiceMock resourceManagementMock; QmlDesigner::Model model{{projectStorageMock, pathCacheMock}, "Item", diff --git a/tests/unit/tests/unittests/componentcore/propertyeditorcomponentgenerator-test.cpp b/tests/unit/tests/unittests/componentcore/propertyeditorcomponentgenerator-test.cpp index 2685009c7ad..ff46d6536d1 100644 --- a/tests/unit/tests/unittests/componentcore/propertyeditorcomponentgenerator-test.cpp +++ b/tests/unit/tests/unittests/componentcore/propertyeditorcomponentgenerator-test.cpp @@ -84,7 +84,7 @@ protected: protected: QmlDesigner::SourceId sourceId = QmlDesigner::SourceId::create(10); - NiceMock projectStorageMock{sourceId, "/path"}; + NiceMock projectStorageMock{sourceId, "/path"}; NiceMock propertyGeneratorMock; QmlDesigner::PropertyEditorComponentGenerator generator{propertyGeneratorMock}; QmlDesigner::ModuleId qtQuickModuleId = projectStorageMock.createModule("QtQuick", diff --git a/tests/unit/tests/unittests/listmodeleditor/listmodeleditor-test.cpp b/tests/unit/tests/unittests/listmodeleditor/listmodeleditor-test.cpp index 5c817d80ec8..29f7ba8a2d6 100644 --- a/tests/unit/tests/unittests/listmodeleditor/listmodeleditor-test.cpp +++ b/tests/unit/tests/unittests/listmodeleditor/listmodeleditor-test.cpp @@ -71,7 +71,7 @@ MATCHER_P2(IsAbstractProperty, node, name, std::string(negation ? "isn't " : "is class ListModelEditor : public testing::Test { - using SourcePathCache = QmlDesigner::SourcePathCache, + using SourcePathCache = QmlDesigner::SourcePathCache, QmlDesigner::NonLockingMutex>; public: @@ -184,7 +184,7 @@ public: protected: NiceMock pathCacheMock{"/path/foo.qml"}; - NiceMock projectStorageMock{pathCacheMock.sourceId, "/path"}; + NiceMock projectStorageMock{pathCacheMock.sourceId, "/path"}; NiceMock> goIntoComponentMock; QmlDesigner::ModelPointer designerModel{ QmlDesigner::Model::create(QmlDesigner::ProjectStorageDependencies{projectStorageMock, diff --git a/tests/unit/tests/unittests/metainfo/nodemetainfo-test.cpp b/tests/unit/tests/unittests/metainfo/nodemetainfo-test.cpp index f9a83cc6089..671317649fa 100644 --- a/tests/unit/tests/unittests/metainfo/nodemetainfo-test.cpp +++ b/tests/unit/tests/unittests/metainfo/nodemetainfo-test.cpp @@ -100,7 +100,7 @@ protected: protected: NiceMock pathCache{"/path/foo.qml"}; - NiceMock projectStorageMock{pathCache.sourceId, "/path"}; + NiceMock projectStorageMock{pathCache.sourceId, "/path"}; QmlDesigner::Model model{{projectStorageMock, pathCache}, "Item", {QmlDesigner::Import::createLibraryImport("QML"), diff --git a/tests/unit/tests/unittests/metainfo/propertymetainfo-test.cpp b/tests/unit/tests/unittests/metainfo/propertymetainfo-test.cpp index e0da900f5e9..d78c9ee8739 100644 --- a/tests/unit/tests/unittests/metainfo/propertymetainfo-test.cpp +++ b/tests/unit/tests/unittests/metainfo/propertymetainfo-test.cpp @@ -42,7 +42,7 @@ protected: protected: NiceMock pathCache{"/path/foo.qml"}; - NiceMock projectStorageMock{pathCache.sourceId, "/path"}; + NiceMock projectStorageMock{pathCache.sourceId, "/path"}; QmlDesigner::Model model{{projectStorageMock, pathCache}, "Item", {QmlDesigner::Import::createLibraryImport("QML"), diff --git a/tests/unit/tests/unittests/model/auxiliarypropertystorageview-test.cpp b/tests/unit/tests/unittests/model/auxiliarypropertystorageview-test.cpp index 61fcce49bb3..a7d68390032 100644 --- a/tests/unit/tests/unittests/model/auxiliarypropertystorageview-test.cpp +++ b/tests/unit/tests/unittests/model/auxiliarypropertystorageview-test.cpp @@ -41,7 +41,7 @@ protected: inline static std::unique_ptr staticData; Sqlite::Database &database = staticData->database; NiceMock pathCacheMock{"/path/foo.qml"}; - NiceMock projectStorageMock{pathCacheMock.sourceId, "/path"}; + NiceMock projectStorageMock{pathCacheMock.sourceId, "/path"}; NiceMock resourceManagementMock; QmlDesigner::Imports imports = {QmlDesigner::Import::createLibraryImport("QtQuick")}; QmlDesigner::Model model{{projectStorageMock, pathCacheMock}, diff --git a/tests/unit/tests/unittests/model/model-test.cpp b/tests/unit/tests/unittests/model/model-test.cpp index c0572cb1553..3c70993681f 100644 --- a/tests/unit/tests/unittests/model/model-test.cpp +++ b/tests/unit/tests/unittests/model/model-test.cpp @@ -117,7 +117,7 @@ protected: protected: NiceMock pathCacheMock{"/path/foo.qml"}; - NiceMock projectStorageMock{pathCacheMock.sourceId, "/path"}; + NiceMock projectStorageMock{pathCacheMock.sourceId, "/path"}; NiceMock resourceManagementMock; QmlDesigner::Imports imports = {QmlDesigner::Import::createLibraryImport("QtQuick")}; QmlDesigner::Model model{{projectStorageMock, pathCacheMock}, diff --git a/tests/unit/tests/unittests/model/modelnode-test.cpp b/tests/unit/tests/unittests/model/modelnode-test.cpp index 8c010ea526b..61d81f6178f 100644 --- a/tests/unit/tests/unittests/model/modelnode-test.cpp +++ b/tests/unit/tests/unittests/model/modelnode-test.cpp @@ -16,7 +16,7 @@ class ModelNode : public testing::Test { protected: NiceMock pathCache{"/path/foo.qml"}; - NiceMock projectStorageMock{pathCache.sourceId, "/path"}; + NiceMock projectStorageMock{pathCache.sourceId, "/path"}; QmlDesigner::Model model{{projectStorageMock, pathCache}, "Item"}; QmlDesigner::ModelNode rootNode = model.rootModelNode(); }; diff --git a/tests/unit/tests/unittests/model/modelresourcemanagement-test.cpp b/tests/unit/tests/unittests/model/modelresourcemanagement-test.cpp index 60ccee8aeb7..b020c7cfd0d 100644 --- a/tests/unit/tests/unittests/model/modelresourcemanagement-test.cpp +++ b/tests/unit/tests/unittests/model/modelresourcemanagement-test.cpp @@ -72,7 +72,7 @@ protected: protected: NiceMock viewMock; NiceMock pathCacheMock{"/path/foo.qml"}; - NiceMock projectStorageMock{pathCacheMock.sourceId, "/path"}; + NiceMock projectStorageMock{pathCacheMock.sourceId, "/path"}; QmlDesigner::ModelResourceManagement management; QmlDesigner::Model model{{projectStorageMock, pathCacheMock}, "Item", diff --git a/tests/unit/tests/unittests/model/modelutils-test.cpp b/tests/unit/tests/unittests/model/modelutils-test.cpp index 89a062801cd..240ef698b87 100644 --- a/tests/unit/tests/unittests/model/modelutils-test.cpp +++ b/tests/unit/tests/unittests/model/modelutils-test.cpp @@ -20,7 +20,7 @@ class ModelUtils : public ::testing::Test protected: NiceMock pathCacheMock{"/path/model.qml"}; QmlDesigner::SourceId sourceId = pathCacheMock.createSourceId("/path/foo.qml"); - NiceMock projectStorageMock{pathCacheMock.sourceId, "/path"}; + NiceMock projectStorageMock{pathCacheMock.sourceId, "/path"}; QmlDesigner::ModuleId moduleId = projectStorageMock.moduleId("QtQuick", ModuleKind::QmlLibrary); QmlDesigner::Model model{{projectStorageMock, pathCacheMock}, "Item", diff --git a/tests/unit/tests/unittests/model/nodelistproperty-test.cpp b/tests/unit/tests/unittests/model/nodelistproperty-test.cpp index ef87369811b..023126f0f70 100644 --- a/tests/unit/tests/unittests/model/nodelistproperty-test.cpp +++ b/tests/unit/tests/unittests/model/nodelistproperty-test.cpp @@ -74,7 +74,7 @@ protected: protected: NiceMock pathCache{"/path/foo.qml"}; - NiceMock projectStorageMock{pathCache.sourceId, "/path"}; + NiceMock projectStorageMock{pathCache.sourceId, "/path"}; QmlDesigner::ModelPointer model{ QmlDesigner::Model::create(QmlDesigner::ProjectStorageDependencies{projectStorageMock, pathCache},