diff options
author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2016-12-06 13:07:00 +0100 |
---|---|---|
committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2016-12-06 14:34:39 +0000 |
commit | 521423b43313459f5e9c75d0720945cc37f6ef8c (patch) | |
tree | 546b279ebe1041e9b99ca9108090f4470aebcc19 /src/plugins/cpptools/cppmodelmanager_test.cpp | |
parent | d006fc41493187b75d014d3865969be5efbc3a0c (diff) | |
download | qt-creator-521423b43313459f5e9c75d0720945cc37f6ef8c.tar.gz |
CppTools: Call ProjectInfo::finish when we get it
No need to require the project managers to do this. Also, it is easy to
forget.
Change-Id: I96f7a5e5547418678af9653e5753c372f0880e5a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanager_test.cpp')
-rw-r--r-- | src/plugins/cpptools/cppmodelmanager_test.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager_test.cpp b/src/plugins/cpptools/cppmodelmanager_test.cpp index 92bbebf91d..38e194dde6 100644 --- a/src/plugins/cpptools/cppmodelmanager_test.cpp +++ b/src/plugins/cpptools/cppmodelmanager_test.cpp @@ -115,7 +115,6 @@ public: part->files.append(projectFile); } projectInfo.appendProjectPart(part); - projectInfo.finish(); } ModelManagerTestHelper *modelManagerTestHelper; @@ -194,7 +193,6 @@ void CppToolsPlugin::test_modelmanager_paths_are_clean() part->headerPaths = { HeaderPath(testDataDir.includeDir(false), HeaderPath::IncludePath), HeaderPath(testDataDir.frameworksDir(false), HeaderPath::FrameworkPath) }; pi.appendProjectPart(part); - pi.finish(); mm->updateProjectInfo(pi); @@ -231,7 +229,6 @@ void CppToolsPlugin::test_modelmanager_framework_headers() _("test_modelmanager_framework_headers.cpp")); part->files << ProjectFile(source, ProjectFile::CXXSource); pi.appendProjectPart(part); - pi.finish(); mm->updateProjectInfo(pi).waitForFinished(); QCoreApplication::processEvents(); @@ -279,7 +276,6 @@ void CppToolsPlugin::test_modelmanager_refresh_also_includes_of_project_files() part->headerPaths = { HeaderPath(testDataDir.includeDir(false), HeaderPath::IncludePath) }; part->files.append(ProjectFile(testCpp, ProjectFile::CXXSource)); pi.appendProjectPart(part); - pi.finish(); QSet<QString> refreshedFiles = helper.updateProjectInfo(pi); QCOMPARE(refreshedFiles.size(), 1); @@ -297,7 +293,6 @@ void CppToolsPlugin::test_modelmanager_refresh_also_includes_of_project_files() part->projectDefines = QByteArray("#define TEST_DEFINE 1\n"); pi = ProjectInfo(project); pi.appendProjectPart(part); - pi.finish(); refreshedFiles = helper.updateProjectInfo(pi); @@ -338,7 +333,6 @@ void CppToolsPlugin::test_modelmanager_refresh_several_times() part->files.append(ProjectFile(testHeader2, ProjectFile::CXXHeader)); part->files.append(ProjectFile(testCpp, ProjectFile::CXXSource)); pi.appendProjectPart(part); - pi.finish(); mm->updateProjectInfo(pi); CPlusPlus::Snapshot snapshot; @@ -358,7 +352,6 @@ void CppToolsPlugin::test_modelmanager_refresh_several_times() part->files.append(ProjectFile(testHeader2, ProjectFile::CXXHeader)); part->files.append(ProjectFile(testCpp, ProjectFile::CXXSource)); pi.appendProjectPart(part); - pi.finish(); refreshedFiles = helper.updateProjectInfo(pi); QCOMPARE(refreshedFiles.size(), 3); @@ -402,7 +395,6 @@ void CppToolsPlugin::test_modelmanager_refresh_test_for_changes() part->qtVersion = ProjectPart::Qt5; part->files.append(ProjectFile(testCpp, ProjectFile::CXXSource)); pi.appendProjectPart(part); - pi.finish(); // Reindexing triggers a reparsing thread helper.resetRefreshedSourceFiles(); @@ -440,7 +432,6 @@ void CppToolsPlugin::test_modelmanager_refresh_added_and_purge_removed() part->files.append(ProjectFile(testCpp, ProjectFile::CXXSource)); part->files.append(ProjectFile(testHeader1, ProjectFile::CXXHeader)); pi.appendProjectPart(part); - pi.finish(); CPlusPlus::Snapshot snapshot; QSet<QString> refreshedFiles; @@ -463,7 +454,6 @@ void CppToolsPlugin::test_modelmanager_refresh_added_and_purge_removed() newPart->files.append(ProjectFile(testCpp, ProjectFile::CXXSource)); newPart->files.append(ProjectFile(testHeader2, ProjectFile::CXXHeader)); pi.appendProjectPart(newPart); - pi.finish(); refreshedFiles = helper.updateProjectInfo(pi); @@ -505,7 +495,6 @@ void CppToolsPlugin::test_modelmanager_refresh_timeStampModified_if_sourcefiles_ part->files.append(ProjectFile(file, ProjectFile::CXXSource)); pi = ProjectInfo(project); pi.appendProjectPart(part); - pi.finish(); Document::Ptr document; CPlusPlus::Snapshot snapshot; @@ -539,7 +528,6 @@ void CppToolsPlugin::test_modelmanager_refresh_timeStampModified_if_sourcefiles_ part->files.append(ProjectFile(file, ProjectFile::CXXSource)); pi = ProjectInfo(project); pi.appendProjectPart(part); - pi.finish(); refreshedFiles = helper.updateProjectInfo(pi); @@ -804,7 +792,6 @@ void CppToolsPlugin::test_modelmanager_defines_per_project() ProjectInfo pi = ProjectInfo(project); pi.appendProjectPart(part1); pi.appendProjectPart(part2); - pi.finish(); helper.updateProjectInfo(pi); QCOMPARE(mm->snapshot().size(), 4); @@ -873,7 +860,6 @@ void CppToolsPlugin::test_modelmanager_precompiled_headers() ProjectInfo pi = ProjectInfo(project); pi.appendProjectPart(part1); pi.appendProjectPart(part2); - pi.finish(); helper.updateProjectInfo(pi); QCOMPARE(mm->snapshot().size(), 4); @@ -955,7 +941,6 @@ void CppToolsPlugin::test_modelmanager_defines_per_editor() ProjectInfo pi = ProjectInfo(project); pi.appendProjectPart(part1); pi.appendProjectPart(part2); - pi.finish(); helper.updateProjectInfo(pi); @@ -1035,7 +1020,6 @@ void CppToolsPlugin::test_modelmanager_updateEditorsAfterProjectUpdate() ProjectInfo pi = ProjectInfo(project); pi.appendProjectPart(part); - pi.finish(); helper.updateProjectInfo(pi); // ... and check for updated editor document A |