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

Tests: Extract TestDataDir to the coreplugin

Browse Source 
Change-Id: Ie290c07c07c13134a57f328e9ae876b2af6974db
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Nikolai Kosjar
2013-08-19 11:49:13 +02:00
parent d185849150
commit 6ac341467d
7 changed files with 177 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,6 +33,7 @@
#include "cppmodelmanager.h"
#include "searchsymbols.h"
#include <coreplugin/testdatadir.h>
#include <utils/runextensions.h>
#include <QtTest>
@@ -42,46 +43,13 @@ using namespace CppTools::Internal;
namespace {
class TestDataDirectory
class MyTestDataDir : public Core::Internal::Tests::TestDataDir
{
public:
TestDataDirectory(const QString &testDataDirectory)
: m_testDataDirectory(QLatin1String(SRCDIR "/../../../tests/cppsymbolsearcher/")
+ testDataDirectory)
{
maybeAppendSlash(&m_testDataDirectory);
QFileInfo testDataDir(m_testDataDirectory);
QVERIFY(testDataDir.exists());
QVERIFY(testDataDir.isDir());
}
/// File from the test data directory (top level)
QString file(const QString &fileName) const
{
return testDataDir() + fileName;
}
private:
QString testDataDir(const QString &subdir = QString(), bool clean = true) const
{
QString path = m_testDataDirectory;
if (!subdir.isEmpty())
path += QLatin1String("/") + subdir;
if (clean)
path = QDir::cleanPath(path);
maybeAppendSlash(&path);
return path;
}
static void maybeAppendSlash(QString *string)
{
const QChar slash = QLatin1Char('/');
if (!string->endsWith(slash))
string->append(slash);
}
private:
QString m_testDataDirectory;
MyTestDataDir(const QString &testDataDirectory)
: TestDataDir(QLatin1String(SRCDIR "/../../../tests/cppsymbolsearcher/")
+ testDataDirectory)
{}
};
class ResultData
@@ -194,7 +162,7 @@ void CppToolsPlugin::test_builtinsymbolsearcher_data()
QTest::addColumn<SymbolSearcher::Parameters>("searchParameters");
QTest::addColumn<ResultDataList>("expectedResults");
TestDataDirectory testDirectory(QLatin1String("testdata_basic"));
MyTestDataDir testDirectory(QLatin1String("testdata_basic"));
const QString testFile = testDirectory.file(QLatin1String("file1.cpp"));
QScopedPointer<CppIndexingSupport> builtinIndexingSupport(new BuiltinIndexingSupport);