diff options
author | Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> | 2015-05-06 11:24:41 +0200 |
---|---|---|
committer | Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> | 2015-06-03 09:15:36 +0000 |
commit | 9425812066a7b0644aeb9ebd62893116085305e3 (patch) | |
tree | f7a23a98751a6037d9a918f2f3e24fa9a045d2d0 /src/plugins/cpptools/cppmodelmanager_test.cpp | |
parent | e661a9c19ec4a0acee696df637db0d5c510b5bd8 (diff) | |
download | qt-creator-9425812066a7b0644aeb9ebd62893116085305e3.tar.gz |
CppTools: Export ModelManagerTestHelper
Needed for tests in ClangCodeModel.
Change-Id: I58bdb35811776751a95b5db198ea8d6cdb0cd6de
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanager_test.cpp')
-rw-r--r-- | src/plugins/cpptools/cppmodelmanager_test.cpp | 35 |
1 files changed, 13 insertions, 22 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager_test.cpp b/src/plugins/cpptools/cppmodelmanager_test.cpp index 38f9c66105..7140ffecc2 100644 --- a/src/plugins/cpptools/cppmodelmanager_test.cpp +++ b/src/plugins/cpptools/cppmodelmanager_test.cpp @@ -167,15 +167,6 @@ private: const QString &m_filePath; }; -static QSet<QString> updateProjectInfo(CppModelManager *modelManager, ModelManagerTestHelper *helper, - const ProjectInfo &projectInfo) -{ - helper->resetRefreshedSourceFiles(); - modelManager->updateProjectInfo(projectInfo).waitForFinished(); - QCoreApplication::processEvents(); - return helper->waitForRefreshedSourceFiles(); -} - void waitForProcessedEditorDocument(const QString &filePath) { CppEditorDocumentHandle *editorDocument @@ -297,7 +288,7 @@ void CppToolsPlugin::test_modelmanager_refresh_also_includes_of_project_files() pi.appendProjectPart(part); pi.finish(); - QSet<QString> refreshedFiles = updateProjectInfo(mm, &helper, pi); + QSet<QString> refreshedFiles = helper.updateProjectInfo(pi); QCOMPARE(refreshedFiles.size(), 1); QVERIFY(refreshedFiles.contains(testCpp)); CPlusPlus::Snapshot snapshot = mm->snapshot(); @@ -315,7 +306,7 @@ void CppToolsPlugin::test_modelmanager_refresh_also_includes_of_project_files() pi.appendProjectPart(part); pi.finish(); - refreshedFiles = updateProjectInfo(mm, &helper, pi); + refreshedFiles = helper.updateProjectInfo(pi); QCOMPARE(refreshedFiles.size(), 1); QVERIFY(refreshedFiles.contains(testCpp)); @@ -376,7 +367,7 @@ void CppToolsPlugin::test_modelmanager_refresh_several_times() pi.appendProjectPart(part); pi.finish(); - refreshedFiles = updateProjectInfo(mm, &helper, pi); + refreshedFiles = helper.updateProjectInfo(pi); QCOMPARE(refreshedFiles.size(), 3); QVERIFY(refreshedFiles.contains(testHeader1)); @@ -461,7 +452,7 @@ void CppToolsPlugin::test_modelmanager_refresh_added_and_purge_removed() CPlusPlus::Snapshot snapshot; QSet<QString> refreshedFiles; - refreshedFiles = updateProjectInfo(mm, &helper, pi); + refreshedFiles = helper.updateProjectInfo(pi); QCOMPARE(refreshedFiles.size(), 2); QVERIFY(refreshedFiles.contains(testHeader1)); @@ -481,7 +472,7 @@ void CppToolsPlugin::test_modelmanager_refresh_added_and_purge_removed() pi.appendProjectPart(newPart); pi.finish(); - refreshedFiles = updateProjectInfo(mm, &helper, pi); + refreshedFiles = helper.updateProjectInfo(pi); // Only the added project file was reparsed QCOMPARE(refreshedFiles.size(), 1); @@ -527,7 +518,7 @@ void CppToolsPlugin::test_modelmanager_refresh_timeStampModified_if_sourcefiles_ CPlusPlus::Snapshot snapshot; QSet<QString> refreshedFiles; - refreshedFiles = updateProjectInfo(mm, &helper, pi); + refreshedFiles = helper.updateProjectInfo(pi); QCOMPARE(refreshedFiles.size(), initialProjectFiles.size()); snapshot = mm->snapshot(); @@ -557,7 +548,7 @@ void CppToolsPlugin::test_modelmanager_refresh_timeStampModified_if_sourcefiles_ pi.appendProjectPart(part); pi.finish(); - refreshedFiles = updateProjectInfo(mm, &helper, pi); + refreshedFiles = helper.updateProjectInfo(pi); QCOMPARE(refreshedFiles.size(), finalProjectFiles.size()); snapshot = mm->snapshot(); @@ -610,7 +601,7 @@ void CppToolsPlugin::test_modelmanager_snapshot_after_two_projects() << _("foo.cpp") << _("main.cpp")); - refreshedFiles = updateProjectInfo(mm, &helper, project1.projectInfo); + refreshedFiles = helper.updateProjectInfo(project1.projectInfo); QCOMPARE(refreshedFiles, project1.projectFiles.toSet()); const int snapshotSizeAfterProject1 = mm->snapshot().size(); @@ -624,7 +615,7 @@ void CppToolsPlugin::test_modelmanager_snapshot_after_two_projects() << _("bar.cpp") << _("main.cpp")); - refreshedFiles = updateProjectInfo(mm, &helper, project2.projectInfo); + refreshedFiles = helper.updateProjectInfo(project2.projectInfo); QCOMPARE(refreshedFiles, project2.projectFiles.toSet()); const int snapshotSizeAfterProject2 = mm->snapshot().size(); @@ -824,7 +815,7 @@ void CppToolsPlugin::test_modelmanager_defines_per_project() pi.appendProjectPart(part2); pi.finish(); - updateProjectInfo(mm, &helper, pi); + helper.updateProjectInfo(pi); QCOMPARE(mm->snapshot().size(), 4); // Open a file in the editor @@ -895,7 +886,7 @@ void CppToolsPlugin::test_modelmanager_precompiled_headers() pi.appendProjectPart(part2); pi.finish(); - updateProjectInfo(mm, &helper, pi); + helper.updateProjectInfo(pi); QCOMPARE(mm->snapshot().size(), 4); // Open a file in the editor @@ -977,7 +968,7 @@ void CppToolsPlugin::test_modelmanager_defines_per_editor() pi.appendProjectPart(part2); pi.finish(); - updateProjectInfo(mm, &helper, pi); + helper.updateProjectInfo(pi); QCOMPARE(mm->snapshot().size(), 4); @@ -1059,7 +1050,7 @@ void CppToolsPlugin::test_modelmanager_updateEditorsAfterProjectUpdate() ProjectInfo pi = ProjectInfo(project); pi.appendProjectPart(part); pi.finish(); - updateProjectInfo(mm, &helper, pi); + helper.updateProjectInfo(pi); // ... and check for updated editor document A while (editorDocumentA->processor()->isParserRunning()) |