summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@digia.com>2014-05-15 10:23:26 -0400
committerNikolai Kosjar <nikolai.kosjar@digia.com>2014-05-23 14:43:54 +0200
commita8690b61fe828a5419e726fb8432b52c522d4961 (patch)
treea4458a742d4f8306867e73715b98635706e04953 /src/plugins/cpptools
parentacbc4b9f07ee8278ee88857c5be224d15e070ffc (diff)
downloadqt-creator-a8690b61fe828a5419e726fb8432b52c522d4961.tar.gz
Cpp{Tools,Editor}: Tests: Use CppModelManager::document()
...instead CppModelManager::snapshot().document(). Change-Id: If79bc03d062d309bbf6d4b229255ba281cddf8d5 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'src/plugins/cpptools')
-rw-r--r--src/plugins/cpptools/cppmodelmanager_test.cpp8
-rw-r--r--src/plugins/cpptools/cpppreprocessor_test.cpp2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager_test.cpp b/src/plugins/cpptools/cppmodelmanager_test.cpp
index 3599968108..7afc7c15c7 100644
--- a/src/plugins/cpptools/cppmodelmanager_test.cpp
+++ b/src/plugins/cpptools/cppmodelmanager_test.cpp
@@ -269,7 +269,7 @@ void CppToolsPlugin::test_modelmanager_framework_headers()
QCoreApplication::processEvents();
QVERIFY(mm->snapshot().contains(source));
- Document::Ptr doc = mm->snapshot().document(source);
+ Document::Ptr doc = mm->document(source);
QVERIFY(!doc.isNull());
CPlusPlus::Namespace *ns = doc->globalNamespace();
QVERIFY(ns);
@@ -857,7 +857,7 @@ void CppToolsPlugin::test_modelmanager_defines_per_project()
while (sup->lastSemanticInfoDocument().isNull())
QCoreApplication::processEvents();
- Document::Ptr doc = mm->snapshot().document(fileName);
+ Document::Ptr doc = mm->document(fileName);
QCOMPARE(nameOfFirstDeclaration(doc), firstDeclarationName);
}
}
@@ -931,7 +931,7 @@ void CppToolsPlugin::test_modelmanager_defines_per_project_pch()
sup->snapshotUpdater()->setUsePrecompiledHeaders(true);
sup->snapshotUpdater()->update(mm->workingCopy());
- Document::Ptr doc = mm->snapshot().document(fileName);
+ Document::Ptr doc = mm->document(fileName);
QCOMPARE(nameOfFirstDeclaration(doc), firstDeclarationName);
}
}
@@ -1000,7 +1000,7 @@ void CppToolsPlugin::test_modelmanager_defines_per_editor()
sup->snapshotUpdater()->setEditorDefines(editorDefines.toUtf8());
sup->snapshotUpdater()->update(mm->workingCopy());
- Document::Ptr doc = mm->snapshot().document(main1File);
+ Document::Ptr doc = mm->document(main1File);
QCOMPARE(nameOfFirstDeclaration(doc), firstDeclarationName);
}
}
diff --git a/src/plugins/cpptools/cpppreprocessor_test.cpp b/src/plugins/cpptools/cpppreprocessor_test.cpp
index c37aa73b1e..61a6c4a7b5 100644
--- a/src/plugins/cpptools/cpppreprocessor_test.cpp
+++ b/src/plugins/cpptools/cpppreprocessor_test.cpp
@@ -73,7 +73,7 @@ public:
pp.setIncludePaths(QStringList(TestIncludePaths::directoryOfTestFile()));
pp.run(fileName);
- Document::Ptr document = m_cmm->snapshot().document(fileName);
+ Document::Ptr document = m_cmm->document(fileName);
QFile(fileName).remove();
return document;
}