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

QmlDesigner: Move source cache types to their own header

Browse Source 
The namespace is now Cache for that types.

Task-number: QDS-4306
Change-Id: I479f1ca534455a41de9dc1d6a1fd891e1d8973eb
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Marco Bubke
2021-05-06 12:26:39 +02:00
parent b3bed53c4f
commit 494469641a
12 changed files with 214 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/unit/unittest/sourcepathcache-test.cpp
View File

@@ -39,7 +39,7 @@ using Cache = QmlDesigner::SourcePathCache<NiceMock<ProjectStorageMock>>;
using NFP = QmlDesigner::SourcePath;
using QmlDesigner::SourcePathView;
using QmlDesigner::SourcePathViews;
using QmlDesigner::Sources::SourceNameAndSourceContextId;
using QmlDesigner::Cache::SourceNameAndSourceContextId;
class SourcePathCache : public testing::Test
{
@@ -61,13 +61,13 @@ protected:
ON_CALL(storageMock, fetchSourceNameAndSourceContextId(SourceId{42}))
.WillByDefault(Return(SourceNameAndSourceContextId("file.cpp", SourceContextId{5})));
ON_CALL(storageMockFilled, fetchAllSources())
.WillByDefault(Return(std::vector<QmlDesigner::Sources::Source>({
.WillByDefault(Return(std::vector<QmlDesigner::Cache::Source>({
{"file.cpp", SourceContextId{6}, SourceId{72}},
{"file2.cpp", SourceContextId{5}, SourceId{63}},
{"file.cpp", SourceContextId{5}, SourceId{42}},
})));
ON_CALL(storageMockFilled, fetchAllSourceContexts())
.WillByDefault(Return(std::vector<QmlDesigner::Sources::SourceContext>(
.WillByDefault(Return(std::vector<QmlDesigner::Cache::SourceContext>(
{{"/path2/to", SourceContextId{6}}, {"/path/to", SourceContextId{5}}})));
ON_CALL(storageMockFilled, fetchSourceContextId(Eq("/path/to")))
.WillByDefault(Return(SourceContextId{5}));