CppEditor/CppTools: Clean up *Test* classes

* Unify class names
* Fix coding style

Change-Id: I7498192ba9e6b9fc0e97d3d4f0dbb30f1853a0c9
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>

1 files changed, 4 insertions, 4 deletions

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<CppModelManager>(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<Document::Include> unresolvedIncludes = document->unresolvedIncludes();