diff options
| author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2016-12-06 11:00:27 +0100 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2016-12-08 08:52:17 +0000 |
| commit | 05942b63f8bad6d6787fea10c31f10458cdccd06 (patch) | |
| tree | 415f80fc4fda748880370cdb36dbf2313060d874 /src/plugins/cpptools/cppmodelmanager_test.cpp | |
| parent | 3602033fcac19fed7491b1ff5173da6c58a47c34 (diff) | |
| download | qt-creator-05942b63f8bad6d6787fea10c31f10458cdccd06.tar.gz | |
CppTools: Do not put configuration document into global snapshot and working copy
These are remnants of the time when we had only one snapshot.
Change-Id: I6ff4db645d1065a0ef195834890e0774e2e2c60e
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanager_test.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppmodelmanager_test.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager_test.cpp b/src/plugins/cpptools/cppmodelmanager_test.cpp index 38e194dde6..6c1bf16c5b 100644 --- a/src/plugins/cpptools/cppmodelmanager_test.cpp +++ b/src/plugins/cpptools/cppmodelmanager_test.cpp @@ -632,7 +632,7 @@ void CppToolsPlugin::test_modelmanager_extraeditorsupport_uiFiles() CppModelManager *mm = CppModelManager::instance(); WorkingCopy workingCopy = mm->workingCopy(); - QCOMPARE(workingCopy.size(), 2); // mm->configurationFileName() and "ui_*.h" + QCOMPARE(workingCopy.size(), 1); QStringList fileNamesInWorkinCopy; QHashIterator<Utils::FileName, QPair<QByteArray, unsigned> > it = workingCopy.iterator(); @@ -642,8 +642,7 @@ void CppToolsPlugin::test_modelmanager_extraeditorsupport_uiFiles() } fileNamesInWorkinCopy.sort(); const QString expectedUiHeaderFileName = _("ui_mainwindow.h"); - QCOMPARE(fileNamesInWorkinCopy.at(0), mm->configurationFileName()); - QCOMPARE(fileNamesInWorkinCopy.at(1), expectedUiHeaderFileName); + QCOMPARE(fileNamesInWorkinCopy.at(0), expectedUiHeaderFileName); // Check CppSourceProcessor / includes. // The CppSourceProcessor is expected to find the ui_* file in the working copy. @@ -794,7 +793,7 @@ void CppToolsPlugin::test_modelmanager_defines_per_project() pi.appendProjectPart(part2); helper.updateProjectInfo(pi); - QCOMPARE(mm->snapshot().size(), 4); + QCOMPARE(mm->snapshot().size(), 3); // Open a file in the editor QCOMPARE(Core::DocumentModel::openedDocuments().size(), 0); @@ -862,7 +861,7 @@ void CppToolsPlugin::test_modelmanager_precompiled_headers() pi.appendProjectPart(part2); helper.updateProjectInfo(pi); - QCOMPARE(mm->snapshot().size(), 4); + QCOMPARE(mm->snapshot().size(), 3); // Open a file in the editor QCOMPARE(Core::DocumentModel::openedDocuments().size(), 0); @@ -944,7 +943,7 @@ void CppToolsPlugin::test_modelmanager_defines_per_editor() helper.updateProjectInfo(pi); - QCOMPARE(mm->snapshot().size(), 4); + QCOMPARE(mm->snapshot().size(), 3); // Open a file in the editor QCOMPARE(Core::DocumentModel::openedDocuments().size(), 0); |