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

QmlDesigner: Move Version to different namespace

Browse Source 
We want to use it not only for synchronization.

Task-number: QDS-9766
Change-Id: I26a2ade8203d9c5131e8dec101885434713f8252
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Marco Bubke
2023-05-06 14:43:53 +02:00
committed by Tim Jenssen
parent c1c90ebd1c
commit 32f84fc05a
13 changed files with 456 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
tests/unit/unittest/qmldocumentparser-test.cpp
View File

@@ -166,10 +166,11 @@ TEST_F(QmlDocumentParser, QualifiedPrototype)
auto type = parser.parse(text, imports, qmlFileSourceId, directoryPath);
ASSERT_THAT(type,
HasPrototype(Storage::QualifiedImportedType("Item",
Storage::Import{exampleModuleId,
Storage::Version{2, 1},
qmlFileSourceId})));
HasPrototype(
Storage::QualifiedImportedType("Item",
Storage::Import{exampleModuleId,
QmlDesigner::Storage::Version{2, 1},
qmlFileSourceId})));
}
TEST_F(QmlDocumentParser, Properties)
@@ -198,7 +199,7 @@ TEST_F(QmlDocumentParser, QualifiedProperties)
"foo",
Storage::QualifiedImportedType("Foo",
Storage::Import{exampleModuleId,
Storage::Version{2, 1},
QmlDesigner::Storage::Version{2, 1},
qmlFileSourceId}),
QmlDesigner::Storage::PropertyDeclarationTraits::None)));
}
@@ -233,7 +234,7 @@ TEST_F(QmlDocumentParser, QualifiedEnumerationInProperties)
"foo",
Storage::QualifiedImportedType("Enumeration.Foo",
Storage::Import{exampleModuleId,
Storage::Version{2, 1},
QmlDesigner::Storage::Version{2, 1},
qmlFileSourceId}),
QmlDesigner::Storage::PropertyDeclarationTraits::None)));
}
@@ -251,12 +252,13 @@ TEST_F(QmlDocumentParser, Imports)
qmlFileSourceId,
directoryPath);
ASSERT_THAT(imports,
UnorderedElementsAre(
Storage::Import{directoryModuleId, Storage::Version{}, qmlFileSourceId},
Storage::Import{fooDirectoryModuleId, Storage::Version{}, qmlFileSourceId},
Storage::Import{qmlModuleId, Storage::Version{}, qmlFileSourceId},
Storage::Import{qtQuickModuleId, Storage::Version{}, qmlFileSourceId}));
ASSERT_THAT(
imports,
UnorderedElementsAre(
Storage::Import{directoryModuleId, QmlDesigner::Storage::Version{}, qmlFileSourceId},
Storage::Import{fooDirectoryModuleId, QmlDesigner::Storage::Version{}, qmlFileSourceId},
Storage::Import{qmlModuleId, QmlDesigner::Storage::Version{}, qmlFileSourceId},
Storage::Import{qtQuickModuleId, QmlDesigner::Storage::Version{}, qmlFileSourceId}));
}
TEST_F(QmlDocumentParser, ImportsWithVersion)
@@ -272,12 +274,13 @@ TEST_F(QmlDocumentParser, ImportsWithVersion)
qmlFileSourceId,
directoryPath);
ASSERT_THAT(imports,
UnorderedElementsAre(
Storage::Import{directoryModuleId, Storage::Version{}, qmlFileSourceId},
Storage::Import{fooDirectoryModuleId, Storage::Version{}, qmlFileSourceId},
Storage::Import{qmlModuleId, Storage::Version{}, qmlFileSourceId},
Storage::Import{qtQuickModuleId, Storage::Version{2, 1}, qmlFileSourceId}));
ASSERT_THAT(
imports,
UnorderedElementsAre(
Storage::Import{directoryModuleId, QmlDesigner::Storage::Version{}, qmlFileSourceId},
Storage::Import{fooDirectoryModuleId, QmlDesigner::Storage::Version{}, qmlFileSourceId},
Storage::Import{qmlModuleId, QmlDesigner::Storage::Version{}, qmlFileSourceId},
Storage::Import{qtQuickModuleId, QmlDesigner::Storage::Version{2, 1}, qmlFileSourceId}));
}
TEST_F(QmlDocumentParser, ImportsWithExplictDirectory)
@@ -293,11 +296,11 @@ TEST_F(QmlDocumentParser, ImportsWithExplictDirectory)
qmlFileSourceId,
directoryPath);
ASSERT_THAT(
imports,
UnorderedElementsAre(Storage::Import{directoryModuleId, Storage::Version{}, qmlFileSourceId},
Storage::Import{qmlModuleId, Storage::Version{}, qmlFileSourceId},
Storage::Import{qtQuickModuleId, Storage::Version{}, qmlFileSourceId}));
ASSERT_THAT(imports,
UnorderedElementsAre(
Storage::Import{directoryModuleId, QmlDesigner::Storage::Version{}, qmlFileSourceId},
Storage::Import{qmlModuleId, QmlDesigner::Storage::Version{}, qmlFileSourceId},
Storage::Import{qtQuickModuleId, QmlDesigner::Storage::Version{}, qmlFileSourceId}));
}
TEST_F(QmlDocumentParser, Functions)
@@ -373,13 +376,14 @@ TEST_F(QmlDocumentParser, DISABLED_DuplicateImportsAreRemoved)
qmlFileSourceId,
directoryPath);
ASSERT_THAT(imports,
UnorderedElementsAre(
Storage::Import{directoryModuleId, Storage::Version{}, qmlFileSourceId},
Storage::Import{fooDirectoryModuleId, Storage::Version{}, qmlFileSourceId},
Storage::Import{qmlModuleId, Storage::Version{1, 0}, qmlFileSourceId},
Storage::Import{qtQmlModuleId, Storage::Version{6, 0}, qmlFileSourceId},
Storage::Import{qtQuickModuleId, Storage::Version{}, qmlFileSourceId}));
ASSERT_THAT(
imports,
UnorderedElementsAre(
Storage::Import{directoryModuleId, QmlDesigner::Storage::Version{}, qmlFileSourceId},
Storage::Import{fooDirectoryModuleId, QmlDesigner::Storage::Version{}, qmlFileSourceId},
Storage::Import{qmlModuleId, QmlDesigner::Storage::Version{1, 0}, qmlFileSourceId},
Storage::Import{qtQmlModuleId, QmlDesigner::Storage::Version{6, 0}, qmlFileSourceId},
Storage::Import{qtQuickModuleId, QmlDesigner::Storage::Version{}, qmlFileSourceId}));
}
TEST_F(QmlDocumentParser, AliasItemProperties)
@@ -510,7 +514,7 @@ TEST_F(QmlDocumentParser, QualifiedListProperty)
"foos",
Storage::QualifiedImportedType{"Foo",
Storage::Import{exampleModuleId,
Storage::Version{2, 1},
QmlDesigner::Storage::Version{2, 1},
qmlFileSourceId}},
QmlDesigner::Storage::PropertyDeclarationTraits::IsList)));
}