Reactivate locator tests as part of core plugin tests

After the move of locator into core plugin

Change-Id: Ie2504ca96f6a77206f0b77a5fc5698adb86b6a4c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

src/plugins/coreplugin/coreplugin.h

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

src/plugins/coreplugin/locator/locator.h

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

src/plugins/coreplugin/locator/locator_test.cpp

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