From c7f3ac407394d3c4d7fe817a6a913cd3256c37e5 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Thu, 19 Dec 2013 01:30:49 +0100 Subject: CppEditor/CppTools: Clean up *Test* classes * Unify class names * Fix coding style Change-Id: I7498192ba9e6b9fc0e97d3d4f0dbb30f1853a0c9 Reviewed-by: Erik Verbruggen --- src/plugins/cpptools/cpppreprocessor_test.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/plugins/cpptools/cpppreprocessor_test.cpp') diff --git a/src/plugins/cpptools/cpppreprocessor_test.cpp b/src/plugins/cpptools/cpppreprocessor_test.cpp index 7316fa3393..9fd95d49ab 100644 --- a/src/plugins/cpptools/cpppreprocessor_test.cpp +++ b/src/plugins/cpptools/cpppreprocessor_test.cpp @@ -43,6 +43,7 @@ using namespace CPlusPlus; using namespace CppTools; +using namespace CppTools::Tests; using namespace CppTools::Internal; typedef Document::Include Include; @@ -58,12 +59,11 @@ public: Document::Ptr run(const QByteArray &source) { - const QString fileName = TestIncludePaths::directoryOfTestFile() - + QLatin1String("/file.cpp"); + const QString fileName = TestIncludePaths::testFilePath(); if (QFileInfo(fileName).exists()) return Document::Ptr(); // Test file was not removed. - CppTools::Tests::TestCase::writeFile(fileName, source); + TestCase::writeFile(fileName, source); CppPreprocessor pp((QPointer(m_cmm))); pp.setIncludePaths(QStringList(TestIncludePaths::directoryOfTestFile())); @@ -107,7 +107,7 @@ void CppToolsPlugin::test_cpppreprocessor_includes() QVERIFY(resolvedIncludes.at(0).type() == Client::IncludeLocal); QCOMPARE(resolvedIncludes.at(0).unresolvedFileName(), QLatin1String("header.h")); const QString expectedResolvedFileName - = TestIncludePaths::directoryOfTestFile() + QLatin1String("/header.h"); + = TestIncludePaths::testFilePath(QLatin1String("header.h")); QCOMPARE(resolvedIncludes.at(0).resolvedFileName(), expectedResolvedFileName); const QList unresolvedIncludes = document->unresolvedIncludes(); -- cgit v1.2.1