feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

UnitTests: Fix typo

Browse Source 
Change-Id: I5f5e3f208603733b173798816f2e9ada9ff39140
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Marco Bubke
2024-06-20 15:39:37 +02:00
parent 778839be5f
commit dad1232165
12 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/unit/tests/mocks/projectstoragemock.h
View File

@@ -364,10 +364,10 @@ public:
exportedTypeNameBySourceId; exportedTypeNameBySourceId;
}; };
class ProjectStorageMockWithQtQtuick : public ProjectStorageMock class ProjectStorageMockWithQtQuick : public ProjectStorageMock
{ {
public: public:
ProjectStorageMockWithQtQtuick(QmlDesigner::SourceId sourceId, ProjectStorageMockWithQtQuick(QmlDesigner::SourceId sourceId,
Utils::SmallStringView localPathModuleName) Utils::SmallStringView localPathModuleName)
{ {
createModule(localPathModuleName, QmlDesigner::Storage::ModuleKind::PathLibrary); createModule(localPathModuleName, QmlDesigner::Storage::ModuleKind::PathLibrary);

2
tests/unit/tests/unittests/componentcore/propertycomponentgenerator-test.cpp
View File

@@ -172,7 +172,7 @@ protected:
inline static QSharedPointer<const QmlJS::SimpleReaderNode> simpleReaderNode; inline static QSharedPointer<const QmlJS::SimpleReaderNode> simpleReaderNode;
NiceMock<AbstractViewMock> viewMock; NiceMock<AbstractViewMock> viewMock;
NiceMock<SourcePathCacheMockWithPaths> pathCacheMock{"/path/foo.qml"}; NiceMock<SourcePathCacheMockWithPaths> pathCacheMock{"/path/foo.qml"};
NiceMock<ProjectStorageMockWithQtQtuick> projectStorageMock{pathCacheMock.sourceId, "/path"}; NiceMock<ProjectStorageMockWithQtQuick> projectStorageMock{pathCacheMock.sourceId, "/path"};
NiceMock<ModelResourceManagementMock> resourceManagementMock; NiceMock<ModelResourceManagementMock> resourceManagementMock;
QmlDesigner::Model model{{projectStorageMock, pathCacheMock}, QmlDesigner::Model model{{projectStorageMock, pathCacheMock},
"Item", "Item",

2
tests/unit/tests/unittests/componentcore/propertyeditorcomponentgenerator-test.cpp
View File

@@ -84,7 +84,7 @@ protected:
protected: protected:
QmlDesigner::SourceId sourceId = QmlDesigner::SourceId::create(10); QmlDesigner::SourceId sourceId = QmlDesigner::SourceId::create(10);
NiceMock<ProjectStorageMockWithQtQtuick> projectStorageMock{sourceId, "/path"}; NiceMock<ProjectStorageMockWithQtQuick> projectStorageMock{sourceId, "/path"};
NiceMock<PropertyComponentGeneratorMock> propertyGeneratorMock; NiceMock<PropertyComponentGeneratorMock> propertyGeneratorMock;
QmlDesigner::PropertyEditorComponentGenerator generator{propertyGeneratorMock}; QmlDesigner::PropertyEditorComponentGenerator generator{propertyGeneratorMock};
QmlDesigner::ModuleId qtQuickModuleId = projectStorageMock.createModule("QtQuick", QmlDesigner::ModuleId qtQuickModuleId = projectStorageMock.createModule("QtQuick",

4
tests/unit/tests/unittests/listmodeleditor/listmodeleditor-test.cpp
View File

@@ -71,7 +71,7 @@ MATCHER_P2(IsAbstractProperty, node, name, std::string(negation ? "isn't " : "is
class ListModelEditor : public testing::Test class ListModelEditor : public testing::Test
{ {
using SourcePathCache = QmlDesigner::SourcePathCache<NiceMock<ProjectStorageMockWithQtQtuick>, using SourcePathCache = QmlDesigner::SourcePathCache<NiceMock<ProjectStorageMockWithQtQuick>,
QmlDesigner::NonLockingMutex>; QmlDesigner::NonLockingMutex>;
public: public:
@@ -184,7 +184,7 @@ public:
protected: protected:
NiceMock<SourcePathCacheMockWithPaths> pathCacheMock{"/path/foo.qml"}; NiceMock<SourcePathCacheMockWithPaths> pathCacheMock{"/path/foo.qml"};
NiceMock<ProjectStorageMockWithQtQtuick> projectStorageMock{pathCacheMock.sourceId, "/path"}; NiceMock<ProjectStorageMockWithQtQuick> projectStorageMock{pathCacheMock.sourceId, "/path"};
NiceMock<MockFunction<ModelNode(const ModelNode &)>> goIntoComponentMock; NiceMock<MockFunction<ModelNode(const ModelNode &)>> goIntoComponentMock;
QmlDesigner::ModelPointer designerModel{ QmlDesigner::ModelPointer designerModel{
QmlDesigner::Model::create(QmlDesigner::ProjectStorageDependencies{projectStorageMock, QmlDesigner::Model::create(QmlDesigner::ProjectStorageDependencies{projectStorageMock,

2
tests/unit/tests/unittests/metainfo/nodemetainfo-test.cpp
View File

@@ -100,7 +100,7 @@ protected:
protected: protected:
NiceMock<SourcePathCacheMockWithPaths> pathCache{"/path/foo.qml"}; NiceMock<SourcePathCacheMockWithPaths> pathCache{"/path/foo.qml"};
NiceMock<ProjectStorageMockWithQtQtuick> projectStorageMock{pathCache.sourceId, "/path"}; NiceMock<ProjectStorageMockWithQtQuick> projectStorageMock{pathCache.sourceId, "/path"};
QmlDesigner::Model model{{projectStorageMock, pathCache}, QmlDesigner::Model model{{projectStorageMock, pathCache},
"Item", "Item",
{QmlDesigner::Import::createLibraryImport("QML"), {QmlDesigner::Import::createLibraryImport("QML"),

2
tests/unit/tests/unittests/metainfo/propertymetainfo-test.cpp
View File

@@ -42,7 +42,7 @@ protected:
protected: protected:
NiceMock<SourcePathCacheMockWithPaths> pathCache{"/path/foo.qml"}; NiceMock<SourcePathCacheMockWithPaths> pathCache{"/path/foo.qml"};
NiceMock<ProjectStorageMockWithQtQtuick> projectStorageMock{pathCache.sourceId, "/path"}; NiceMock<ProjectStorageMockWithQtQuick> projectStorageMock{pathCache.sourceId, "/path"};
QmlDesigner::Model model{{projectStorageMock, pathCache}, QmlDesigner::Model model{{projectStorageMock, pathCache},
"Item", "Item",
{QmlDesigner::Import::createLibraryImport("QML"), {QmlDesigner::Import::createLibraryImport("QML"),

2
tests/unit/tests/unittests/model/auxiliarypropertystorageview-test.cpp
View File

@@ -41,7 +41,7 @@ protected:
inline static std::unique_ptr<StaticData> staticData; inline static std::unique_ptr<StaticData> staticData;
Sqlite::Database &database = staticData->database; Sqlite::Database &database = staticData->database;
NiceMock<SourcePathCacheMockWithPaths> pathCacheMock{"/path/foo.qml"}; NiceMock<SourcePathCacheMockWithPaths> pathCacheMock{"/path/foo.qml"};
NiceMock<ProjectStorageMockWithQtQtuick> projectStorageMock{pathCacheMock.sourceId, "/path"}; NiceMock<ProjectStorageMockWithQtQuick> projectStorageMock{pathCacheMock.sourceId, "/path"};
NiceMock<ModelResourceManagementMock> resourceManagementMock; NiceMock<ModelResourceManagementMock> resourceManagementMock;
QmlDesigner::Imports imports = {QmlDesigner::Import::createLibraryImport("QtQuick")}; QmlDesigner::Imports imports = {QmlDesigner::Import::createLibraryImport("QtQuick")};
QmlDesigner::Model model{{projectStorageMock, pathCacheMock}, QmlDesigner::Model model{{projectStorageMock, pathCacheMock},

2
tests/unit/tests/unittests/model/model-test.cpp
View File

@@ -117,7 +117,7 @@ protected:
protected: protected:
NiceMock<SourcePathCacheMockWithPaths> pathCacheMock{"/path/foo.qml"}; NiceMock<SourcePathCacheMockWithPaths> pathCacheMock{"/path/foo.qml"};
NiceMock<ProjectStorageMockWithQtQtuick> projectStorageMock{pathCacheMock.sourceId, "/path"}; NiceMock<ProjectStorageMockWithQtQuick> projectStorageMock{pathCacheMock.sourceId, "/path"};
NiceMock<ModelResourceManagementMock> resourceManagementMock; NiceMock<ModelResourceManagementMock> resourceManagementMock;
QmlDesigner::Imports imports = {QmlDesigner::Import::createLibraryImport("QtQuick")}; QmlDesigner::Imports imports = {QmlDesigner::Import::createLibraryImport("QtQuick")};
QmlDesigner::Model model{{projectStorageMock, pathCacheMock}, QmlDesigner::Model model{{projectStorageMock, pathCacheMock},

2
tests/unit/tests/unittests/model/modelnode-test.cpp
View File

@@ -16,7 +16,7 @@ class ModelNode : public testing::Test
{ {
protected: protected:
NiceMock<SourcePathCacheMockWithPaths> pathCache{"/path/foo.qml"}; NiceMock<SourcePathCacheMockWithPaths> pathCache{"/path/foo.qml"};
NiceMock<ProjectStorageMockWithQtQtuick> projectStorageMock{pathCache.sourceId, "/path"}; NiceMock<ProjectStorageMockWithQtQuick> projectStorageMock{pathCache.sourceId, "/path"};
QmlDesigner::Model model{{projectStorageMock, pathCache}, "Item"}; QmlDesigner::Model model{{projectStorageMock, pathCache}, "Item"};
QmlDesigner::ModelNode rootNode = model.rootModelNode(); QmlDesigner::ModelNode rootNode = model.rootModelNode();
}; };

2
tests/unit/tests/unittests/model/modelresourcemanagement-test.cpp
View File

@@ -72,7 +72,7 @@ protected:
protected: protected:
NiceMock<AbstractViewMock> viewMock; NiceMock<AbstractViewMock> viewMock;
NiceMock<SourcePathCacheMockWithPaths> pathCacheMock{"/path/foo.qml"}; NiceMock<SourcePathCacheMockWithPaths> pathCacheMock{"/path/foo.qml"};
NiceMock<ProjectStorageMockWithQtQtuick> projectStorageMock{pathCacheMock.sourceId, "/path"}; NiceMock<ProjectStorageMockWithQtQuick> projectStorageMock{pathCacheMock.sourceId, "/path"};
QmlDesigner::ModelResourceManagement management; QmlDesigner::ModelResourceManagement management;
QmlDesigner::Model model{{projectStorageMock, pathCacheMock}, QmlDesigner::Model model{{projectStorageMock, pathCacheMock},
"Item", "Item",

2
tests/unit/tests/unittests/model/modelutils-test.cpp
View File

@@ -20,7 +20,7 @@ class ModelUtils : public ::testing::Test
protected: protected:
NiceMock<SourcePathCacheMockWithPaths> pathCacheMock{"/path/model.qml"}; NiceMock<SourcePathCacheMockWithPaths> pathCacheMock{"/path/model.qml"};
QmlDesigner::SourceId sourceId = pathCacheMock.createSourceId("/path/foo.qml"); QmlDesigner::SourceId sourceId = pathCacheMock.createSourceId("/path/foo.qml");
NiceMock<ProjectStorageMockWithQtQtuick> projectStorageMock{pathCacheMock.sourceId, "/path"}; NiceMock<ProjectStorageMockWithQtQuick> projectStorageMock{pathCacheMock.sourceId, "/path"};
QmlDesigner::ModuleId moduleId = projectStorageMock.moduleId("QtQuick", ModuleKind::QmlLibrary); QmlDesigner::ModuleId moduleId = projectStorageMock.moduleId("QtQuick", ModuleKind::QmlLibrary);
QmlDesigner::Model model{{projectStorageMock, pathCacheMock}, QmlDesigner::Model model{{projectStorageMock, pathCacheMock},
"Item", "Item",

2
tests/unit/tests/unittests/model/nodelistproperty-test.cpp
View File

@@ -74,7 +74,7 @@ protected:
protected: protected:
NiceMock<SourcePathCacheMockWithPaths> pathCache{"/path/foo.qml"}; NiceMock<SourcePathCacheMockWithPaths> pathCache{"/path/foo.qml"};
NiceMock<ProjectStorageMockWithQtQtuick> projectStorageMock{pathCache.sourceId, "/path"}; NiceMock<ProjectStorageMockWithQtQuick> projectStorageMock{pathCache.sourceId, "/path"};
QmlDesigner::ModelPointer model{ QmlDesigner::ModelPointer model{
QmlDesigner::Model::create(QmlDesigner::ProjectStorageDependencies{projectStorageMock, QmlDesigner::Model::create(QmlDesigner::ProjectStorageDependencies{projectStorageMock,
pathCache}, pathCache},