feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Tests: Move TestDataDir into plugintestutils.{h,cpp}

Browse Source 
Change-Id: I76d5e421258eda85907e56762a59894ce7f84f13
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Nikolai Kosjar
2013-10-01 10:22:37 +02:00
parent f47e7f68d9
commit 3103487038
12 changed files with 63 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cpptools/cppheadersource_test.cpp
View File

@@ -30,7 +30,7 @@
#include "cpptoolsplugin.h"
#include "cpptoolsreuse.h"
#include <coreplugin/testdatadir.h>
#include <coreplugin/plugintestutils.h>
#include <QDir>
#include <QtTest>
@@ -46,7 +46,7 @@ void CppToolsPlugin::test_headersource()
QFETCH(QString, headerFileName);
bool wasHeader;
Core::Internal::Tests::TestDataDir dataDir(
Core::Tests::TestDataDir dataDir(
_(SRCDIR "/../../../tests/cppheadersource/") + _(QTest::currentDataTag()));
const QString sourcePath = dataDir.file(sourceFileName);

4
src/plugins/cpptools/cpplocatorfilter_test.cpp
View File

@@ -37,7 +37,6 @@
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/plugintestutils.h>
#include <coreplugin/testdatadir.h>
#include <extensionsystem/pluginmanager.h>
#include <locator/locatorfiltertest.h>
#include <utils/fileutils.h>
@@ -47,7 +46,6 @@
#include <QtTest>
using namespace Core;
using namespace Core::Internal::Tests;
using namespace CppTools::Internal;
using namespace ExtensionSystem;
using namespace Locator;
@@ -59,7 +57,7 @@ Q_DECLARE_METATYPE(ILocatorFilter *)
namespace {
class MyTestDataDir : public Core::Internal::Tests::TestDataDir
class MyTestDataDir : public Core::Tests::TestDataDir
{
public:
MyTestDataDir(const QString &testDataDirectory)

3
src/plugins/cpptools/cppmodelmanager_test.cpp
View File

@@ -34,7 +34,6 @@
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/plugintestutils.h>
#include <coreplugin/testdatadir.h>
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/session.h>
#include <utils/hostosinfo.h>
@@ -61,7 +60,7 @@ Q_DECLARE_METATYPE(QList<ProjectFile>)
namespace {
class MyTestDataDir : public Core::Internal::Tests::TestDataDir
class MyTestDataDir : public Core::Tests::TestDataDir
{
public:
MyTestDataDir(const QString &dir)

4
src/plugins/cpptools/symbolsearcher_test.cpp
View File

@@ -33,7 +33,7 @@
#include "cppmodelmanager.h"
#include "searchsymbols.h"
#include <coreplugin/testdatadir.h>
#include <coreplugin/plugintestutils.h>
#include <utils/runextensions.h>
#include <QtTest>
@@ -43,7 +43,7 @@ using namespace CppTools::Internal;
namespace {
class MyTestDataDir : public Core::Internal::Tests::TestDataDir
class MyTestDataDir : public Core::Tests::TestDataDir
{
public:
MyTestDataDir(const QString &testDataDirectory)