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

QmlDesigner: Remove document imports for deleted documents

Browse Source 
Task-number: QDS-4724
Change-Id: Ie5ec1788387c224b48380fa0f256b012f2b7dbcf
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Marco Bubke
2021-07-22 12:42:30 +02:00
parent 3b33a13661
commit 3ed4c8dd05
2 changed files with 48 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/unit/unittest/projectstorage-test.cpp
View File

@@ -630,11 +630,11 @@ protected:
{
importSourceId4 = sourcePathCache.sourceId(importPath4);
auto importDependencies = createImportDependencies();
importDependencies.push_back(
auto newImportDependencies = createImportDependencies();
newImportDependencies.push_back(
Storage::ImportDependency{"Qml2", Storage::VersionNumber{3}, importSourceId4, {}});
return importDependencies;
return newImportDependencies;
}
void setUpImportDependenciesAndDocuments()
@@ -973,7 +973,7 @@ TEST_F(ProjectStorageSlowTest, SynchronizeTypesAddsNewTypesWithMissingImportAndE
TypeAccessSemantics::Reference,
sourceId4,
{Storage::ExportedType{"Object2"}, Storage::ExportedType{"Obj2"}}});
storage.synchronize({}, {Storage::Document{sourceId1, {imports[0]}}}, {}, {});
storage.synchronize({}, {Storage::Document{sourceId1, {imports[0]}}}, {}, {sourceId1});
types[1].prototype = Storage::ExportedType{"Object2"};
ASSERT_THROW(storage.synchronize({}, {}, types, {sourceId1, sourceId2}),
@@ -983,7 +983,7 @@ TEST_F(ProjectStorageSlowTest, SynchronizeTypesAddsNewTypesWithMissingImportAndE
TEST_F(ProjectStorageSlowTest, SynchronizeTypesAddsNewTypesWithMissingImport)
{
Storage::Types types{createTypes()};
storage.synchronize({}, {Storage::Document{sourceId1, {imports[0]}}}, {}, {});
storage.synchronize({}, {Storage::Document{sourceId1, {imports[0]}}}, {}, {sourceId1});
ASSERT_THROW(storage.synchronize({}, {}, types, {sourceId1, sourceId2}),
QmlDesigner::TypeNameDoesNotExists);
@@ -1280,7 +1280,7 @@ TEST_F(ProjectStorageSlowTest,
SynchronizeTypesAddPropertyDeclarationsWithMissingImportIdsForNativeTypes)
{
Storage::Types types{createTypes()};
storage.synchronize({}, {Storage::Document{sourceId1, {imports[1]}}}, {}, {});
storage.synchronize({}, {Storage::Document{sourceId1, {imports[1]}}}, {}, {sourceId1});
types[0].propertyDeclarations.pop_back();
ASSERT_THROW(storage.synchronize({}, {}, types, {}), QmlDesigner::TypeNameDoesNotExists);
@@ -1290,7 +1290,7 @@ TEST_F(ProjectStorageSlowTest,
SynchronizeTypesAddPropertyDeclarationsWithMissingImportIdsForExportedTypes)
{
Storage::Types types{createTypes()};
storage.synchronize({}, {Storage::Document{sourceId1, {imports[0]}}}, {}, {});
storage.synchronize({}, {Storage::Document{sourceId1, {imports[0]}}}, {}, {sourceId1});
types[0].propertyDeclarations[0].typeName = Storage::ExportedType{"Obj"};
ASSERT_THROW(storage.synchronize({}, {}, types, {}), QmlDesigner::TypeNameDoesNotExists);