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

Reactivate locator tests as part of core plugin tests

Browse Source 
After the move of locator into core plugin

Change-Id: Ie2504ca96f6a77206f0b77a5fc5698adb86b6a4c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
Eike Ziller
2014-02-14 16:30:21 +01:00
parent e47acb151b
commit 5fd7c0bcec
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/coreplugin/coreplugin.h
View File

@@ -65,6 +65,9 @@ private slots:
#if defined(WITH_TESTS) #if defined(WITH_TESTS)
void testVcsManager_data(); void testVcsManager_data();
void testVcsManager(); void testVcsManager();
// Locator:
void test_basefilefilter();
void test_basefilefilter_data();
#endif #endif
private: private:

5
src/plugins/coreplugin/locator/locator.h
View File

@@ -77,11 +77,6 @@ public slots:
private slots: private slots:
void updatePlaceholderText(Core::Command *command = 0); void updatePlaceholderText(Core::Command *command = 0);
#ifdef WITH_TESTS
void test_basefilefilter();
void test_basefilefilter_data();
#endif
private: private:
void loadSettings(); void loadSettings();

8
src/plugins/coreplugin/locator/locator_test.cpp
View File

@@ -28,7 +28,7 @@
****************************************************************************/ ****************************************************************************/
#include "locator.h" #include "coreplugin.h"
#include "basefilefilter.h" #include "basefilefilter.h"
#include "locatorfiltertest.h" #include "locatorfiltertest.h"
@@ -44,7 +44,7 @@ using namespace Core::Tests;
namespace { namespace {
QTC_DECLARE_MYTESTDATADIR("../../../tests/locators/") QTC_DECLARE_MYTESTDATADIR("../../../../tests/locators/")
class MyBaseFileFilter : public Core::BaseFileFilter class MyBaseFileFilter : public Core::BaseFileFilter
{ {
@@ -80,7 +80,7 @@ public:
Q_DECLARE_METATYPE(ReferenceData) Q_DECLARE_METATYPE(ReferenceData)
Q_DECLARE_METATYPE(QList<ReferenceData>) Q_DECLARE_METATYPE(QList<ReferenceData>)
void Core::Internal::Locator::test_basefilefilter() void Core::Internal::CorePlugin::test_basefilefilter()
{ {
QFETCH(QStringList, testFiles); QFETCH(QStringList, testFiles);
QFETCH(QList<ReferenceData>, referenceDataList); QFETCH(QList<ReferenceData>, referenceDataList);
@@ -97,7 +97,7 @@ void Core::Internal::Locator::test_basefilefilter()
} }
} }
void Core::Internal::Locator::test_basefilefilter_data() void Core::Internal::CorePlugin::test_basefilefilter_data()
{ {
QTest::addColumn<QStringList>("testFiles"); QTest::addColumn<QStringList>("testFiles");
QTest::addColumn<QList<ReferenceData> >("referenceDataList"); QTest::addColumn<QList<ReferenceData> >("referenceDataList");