Refactored PluginFramework test environment.

Libs/PluginFramework/Testing/CMakeLists.txt

@@ -1,8 +1,11 @@
+SET(fw_lib ${PROJECT_NAME} CACHE INTERNAL "Name of the PluginFramework library")
+SET(fwtestutil_lib ${PROJECT_NAME}TestUtil CACHE INTERNAL "Name of the PluginFramework test utility library")
+
 ADD_SUBDIRECTORY(Cpp)
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Cpp)
 
-SET(test_plugins
+SET(fwtest_plugins
   pluginA_test
   pluginA2_test
   pluginD_test
@@ -12,4 +15,6 @@ SET(test_plugins
 )
 
 ADD_SUBDIRECTORY(FrameworkTest)
-ADD_SUBDIRECTORY(TestPlugins)
+ADD_SUBDIRECTORY(FrameworkTestPlugins)
+
+ADD_SUBDIRECTORY(ConfigAdminTest)

Libs/PluginFramework/Testing/Cpp/CMakeLists.txt

@@ -1,6 +1,11 @@
+# Code in this directory will be compiled into
+# a static utility library. Test executables may
+# link to it to bootstrap a plugin framework and
+# start registered tests.
+
 SET(SRCS
-  ctkPluginFrameworkTestMain.cpp
-  ctkPluginFrameworkTestUtil.h
+  ctkPluginFrameworkTestUtil.cpp
+  ctkPluginFrameworkTestRunner.cpp
   ctkTestSuiteInterface.h
 )
 
@@ -10,12 +15,9 @@ SET(MY_MOC_CXX )
 
 #QT4_WRAP_CPP(MY_MOC_CXX ${MOC_SRCS})
 
-SET(test_executable ${PROJECT_NAME}CppTests)
-
-ADD_EXECUTABLE(${test_executable} ${SRCS} ${MY_MOC_CXX})
-TARGET_LINK_LIBRARIES(${test_executable} ${PROJECT_NAME})
+SET(lib_name ${fwtestutil_lib})
 
-ADD_DEPENDENCIES(${test_executable} org_commontk_pluginfwtest)
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
 
-ADD_TEST(${PROJECT_NAME}Tests ${CPP_TEST_PATH}/${test_executable})
-SET_PROPERTY(TEST ${PROJECT_NAME}Tests PROPERTY LABELS ${PROJECT_NAME})
+ADD_LIBRARY(${lib_name} STATIC ${SRCS} ${MY_MOC_CXX})
+TARGET_LINK_LIBRARIES(${lib_name} ${fw_lib})

Libs/PluginFramework/Testing/Cpp/ctkPluginFrameworkTestMain.cpp

@@ -1,139 +0,0 @@
-/*=============================================================================
-
-  Library: CTK
-
-  Copyright (c) 2010 German Cancer Research Center,
-    Division of Medical and Biological Informatics
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-=============================================================================*/
-
-#include <QCoreApplication>
-#include <QDirIterator>
-#include <QTest>
-#include <QThread>
-
-#include <ctkPluginContext.h>
-#include <ctkPluginConstants.h>
-#include <ctkPluginFrameworkFactory.h>
-#include <ctkPluginFramework.h>
-#include <ctkPluginException.h>
-#include <ctkServiceReference.h>
-
-#include "ctkTestSuiteInterface.h"
-
-class TestRunner : public QThread
-{
-public:
-
-  TestRunner(ctkPluginContext* context, long testPluginId, int argc, char** argv)
-    : context(context), testPluginId(testPluginId), argc(argc), argv(argv)
-  {
-
-  }
-
-  void run()
-  {
-    // start the main test plugin which registers the test suites (QObject classes)
-    QSharedPointer<ctkPlugin> fwTest = context->getPlugin(testPluginId);
-    fwTest->start();
-
-    QList<ctkServiceReference> refs = context->getServiceReferences<ctkTestSuiteInterface>();
-
-    int result = 0;
-    foreach(ctkServiceReference ref, refs)
-    {
-      result += QTest::qExec(context->getService(ref), argc, argv);
-      if (result > 0) break;
-    }
-
-    if (result > 0) QCoreApplication::exit(result);
-  }
-
-private:
-
-  ctkPluginContext* context;
-  long testPluginId;
-  int argc;
-  char** argv;
-};
-
-int main(int argc, char** argv)
-{
-  QCoreApplication app(argc, argv);
-
-  app.setOrganizationName("CTK");
-  app.setOrganizationDomain("commontk.org");
-  app.setApplicationName("ctkPluginFrameworkCppTests");
-
-  QString pluginDir;
-#ifdef CMAKE_INTDIR
-  pluginDir = qApp->applicationDirPath() + "/../test_plugins/" CMAKE_INTDIR "/";
-#else
-  pluginDir = qApp->applicationDirPath() + "/test_plugins/";
-#endif
-
-  QApplication::addLibraryPath(pluginDir);
-
-  ctkProperties fwProps;
-  fwProps.insert(ctkPluginConstants::FRAMEWORK_STORAGE_CLEAN, ctkPluginConstants::FRAMEWORK_STORAGE_CLEAN_ONFIRSTINIT);
-  fwProps.insert("pluginfw.testDir", pluginDir);
-  ctkPluginFrameworkFactory fwFactory(fwProps);
-  QSharedPointer<ctkPluginFramework> framework = fwFactory.getFramework();
-  framework->start();
-
-  ctkPluginContext* context = framework->getPluginContext();
-
-  long fwTestPluginId = -1;
-  QStringList libFilter;
-  libFilter << "*.dll" << "*.so" << "*.dylib";
-  QDirIterator dirIter(pluginDir, libFilter, QDir::Files);
-  while(dirIter.hasNext())
-  {
-    dirIter.next();
-    if (dirIter.fileName().contains("org_commontk_pluginfwtest"))
-    {
-      try
-      {
-        fwTestPluginId = context->installPlugin(QUrl::fromLocalFile(dirIter.filePath()).toString())->getPluginId();
-        break;
-      }
-      catch (const ctkPluginException& e)
-      {
-        qCritical() << e.what();
-      }
-    }
-  }
-
-  if (fwTestPluginId < 0)
-  {
-    qCritical() << "Could not find the plugin framework test plugin: org.commontk.pluginfwtest";
-  }
-
-//  QList<ctkServiceReference> refs = context->getServiceReferences("ctkTestSuiteInterface");
-
-//  int result = 0;
-//  foreach(ctkServiceReference ref, refs)
-//  {
-//    result = QTest::qExec(context->getService(ref), argc, argv);
-//  }
-
-//  return result;
-
-  TestRunner runner(context, fwTestPluginId, argc, argv);
-  runner.connect(&runner, SIGNAL(finished()), &app, SLOT(quit()));
-  runner.start();
-
-  return app.exec();
-}

Libs/PluginFramework/Testing/Cpp/ctkPluginFrameworkTestRunner.cpp

@@ -0,0 +1,247 @@
+/*=============================================================================
+
+  Library: CTK
+
+  Copyright (c) German Cancer Research Center,
+    Division of Medical and Biological Informatics
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+=============================================================================*/
+
+
+#include "ctkPluginFrameworkTestRunner.h"
+
+#include "ctkTestSuiteInterface.h"
+
+#include <ctkPluginFrameworkFactory.h>
+#include <ctkPluginFramework.h>
+#include <ctkPluginContext.h>
+#include <ctkPluginException.h>
+
+#include <QStringList>
+#include <QPair>
+#include <QCoreApplication>
+#include <QDirIterator>
+#include <QTest>
+#include <QThread>
+#include <QDebug>
+
+class TestRunner : public QThread
+{
+public:
+
+  typedef QPair<long, ctkPlugin::StartOptions> StartPluginPair;
+
+  TestRunner(ctkPluginContext* context, const QSet<StartPluginPair>& startPlugins, int argc, char** argv)
+    : context(context), startPluginInfos(startPlugins),
+      argc(argc), argv(argv)
+  {
+
+  }
+
+  void run()
+  {
+    // start the specified plugins which may register the test suites (QObject classes)
+    foreach(StartPluginPair pluginInfo, startPluginInfos)
+    {
+      QSharedPointer<ctkPlugin> plugin = context->getPlugin(pluginInfo.first);
+      plugin->start(pluginInfo.second);
+    }
+
+    QList<ctkServiceReference> refs = context->getServiceReferences<ctkTestSuiteInterface>();
+
+    int result = 0;
+    foreach(ctkServiceReference ref, refs)
+    {
+      result += QTest::qExec(context->getService(ref), argc, argv);
+      if (result > 0) break;
+    }
+
+    if (result > 0) QCoreApplication::exit(result);
+  }
+
+private:
+
+  ctkPluginContext* context;
+  QSet<StartPluginPair> startPluginInfos;
+  int argc;
+  char** argv;
+};
+
+class ctkPluginFrameworkTestRunnerPrivate
+{
+public:
+
+  typedef QPair<QString, bool> PluginPathPair;
+  QList<PluginPathPair> pluginPaths;
+
+  typedef QPair<QString, QString> InstallCandPair;
+  QList<InstallCandPair> installCandidates;
+
+  typedef QPair<QString, ctkPlugin::StartOptions> ActivatePair;
+  QList<ActivatePair> activatePlugins;
+
+  typedef QPair<long, ctkPlugin::StartOptions> StartPluginPair;
+  QSet<StartPluginPair> startPlugins;
+
+  ctkPluginContext* context;
+
+  ctkPluginFrameworkFactory* fwFactory;
+
+  ctkPluginFrameworkTestRunnerPrivate()
+    : context(0), fwFactory(0)
+  {
+    pluginLibFilter << "*.dll" << "*.so" << "*.dylib";
+  }
+
+  void installPlugins(const QString& path)
+  {
+    QDirIterator dirIter(path, pluginLibFilter, QDir::Files);
+    while(dirIter.hasNext())
+    {
+      dirIter.next();
+      try
+      {
+        QSharedPointer<ctkPlugin> plugin = context->installPlugin(QUrl::fromLocalFile(dirIter.filePath()));
+        long pluginId = plugin->getPluginId();
+        QString symbolicName = plugin->getSymbolicName();
+        foreach(ActivatePair activatePlugin, activatePlugins)
+        {
+          if (activatePlugin.first == symbolicName)
+          {
+            startPlugins.insert(qMakePair(pluginId, activatePlugin.second));
+            activatePlugins.removeAll(activatePlugin);
+            break;
+          }
+        }
+      }
+      catch (const ctkPluginException& e)
+      {
+        qCritical() << e.what();
+      }
+    }
+  }
+
+  void installPlugin(const QString& path, const QString& name)
+  {
+    QDirIterator dirIter(path, pluginLibFilter, QDir::Files);
+    while(dirIter.hasNext())
+    {
+      dirIter.next();
+      if (dirIter.fileName().contains(name))
+      {
+        try
+        {
+          QSharedPointer<ctkPlugin> plugin = context->installPlugin(QUrl::fromLocalFile(dirIter.filePath()));
+          QString symbolicName = plugin->getSymbolicName();
+          long pluginId = plugin->getPluginId();
+          foreach(ActivatePair activatePlugin, activatePlugins)
+          {
+            if (activatePlugin.first == symbolicName)
+            {
+              startPlugins.insert(qMakePair(pluginId, activatePlugin.second));
+              activatePlugins.removeAll(activatePlugin);
+              break;
+            }
+          }
+          break;
+        }
+        catch (const ctkPluginException& e)
+        {
+          qCritical() << e.what();
+        }
+      }
+    }
+  }
+
+private:
+
+  QStringList pluginLibFilter;
+};
+
+ctkPluginFrameworkTestRunner::ctkPluginFrameworkTestRunner()
+  : d_ptr(new ctkPluginFrameworkTestRunnerPrivate())
+{
+
+}
+
+ctkPluginFrameworkTestRunner::~ctkPluginFrameworkTestRunner()
+{
+  Q_D(ctkPluginFrameworkTestRunner);
+  delete d->fwFactory;
+}
+
+void ctkPluginFrameworkTestRunner::addPluginPath(const QString& path, bool install)
+{
+  Q_D(ctkPluginFrameworkTestRunner);
+  d->pluginPaths.push_back(qMakePair(path, install));
+}
+
+void ctkPluginFrameworkTestRunner::addPlugin(const QString &path, const QString &name)
+{
+  Q_D(ctkPluginFrameworkTestRunner);
+  d->installCandidates.push_back(qMakePair(path, name));
+}
+
+void ctkPluginFrameworkTestRunner::startPluginOnRun(const QString& pluginId, ctkPlugin::StartOptions opts)
+{
+  Q_D(ctkPluginFrameworkTestRunner);
+  d->activatePlugins.push_back(qMakePair(pluginId, opts));
+}
+
+void ctkPluginFrameworkTestRunner::init(const ctkProperties& fwProps)
+{
+  Q_D(ctkPluginFrameworkTestRunner);
+
+  d->fwFactory = new ctkPluginFrameworkFactory(fwProps);
+  QSharedPointer<ctkPluginFramework> framework = d->fwFactory->getFramework();
+  framework->start();
+
+  d->context = framework->getPluginContext();
+
+  foreach(ctkPluginFrameworkTestRunnerPrivate::PluginPathPair path,
+          d->pluginPaths)
+  {
+    QCoreApplication::addLibraryPath(path.first);
+    if (path.second) d->installPlugins(path.first);
+  }
+
+  foreach(ctkPluginFrameworkTestRunnerPrivate::InstallCandPair candidate,
+          d->installCandidates)
+  {
+    d->installPlugin(candidate.first, candidate.second);
+  }
+}
+
+int ctkPluginFrameworkTestRunner::run(int argc, char** argv)
+{
+  Q_D(ctkPluginFrameworkTestRunner);
+
+  if (!d->activatePlugins.isEmpty())
+  {
+    qCritical() << "The following plugins will not be started, because"
+                << "they could not be installed:";
+    foreach(ctkPluginFrameworkTestRunnerPrivate::ActivatePair p,
+            d->activatePlugins)
+    {
+      qCritical() << "  -" << p.first;
+    }
+  }
+
+  TestRunner runner(d->context, d->startPlugins, argc, argv);
+  runner.connect(&runner, SIGNAL(finished()), qApp, SLOT(quit()));
+  runner.start();
+
+  return qApp->exec();
+}

Libs/PluginFramework/Testing/Cpp/ctkPluginFrameworkTestRunner.h

@@ -0,0 +1,53 @@
+/*=============================================================================
+
+  Library: CTK
+
+  Copyright (c) German Cancer Research Center,
+    Division of Medical and Biological Informatics
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+=============================================================================*/
+
+
+#ifndef CTKPLUGINFRAMEWORKTESTRUNNER_H
+#define CTKPLUGINFRAMEWORKTESTRUNNER_H
+
+#include <ctkPlugin.h>
+#include <ctkPluginFramework_global.h>
+
+class ctkPluginFrameworkTestRunnerPrivate;
+
+class ctkPluginFrameworkTestRunner
+{
+
+public:
+
+  ctkPluginFrameworkTestRunner();
+  ~ctkPluginFrameworkTestRunner();
+
+  void addPluginPath(const QString& path, bool install = true);
+  void addPlugin(const QString& path, const QString& name);
+  void startPluginOnRun(const QString& name, ctkPlugin::StartOptions opts = ctkPlugin::START_ACTIVATION_POLICY);
+
+  void init(const ctkProperties& fwProps = ctkProperties());
+  int run(int argc, char** argv);
+
+private:
+
+  Q_DECLARE_PRIVATE(ctkPluginFrameworkTestRunner)
+
+  const QScopedPointer<ctkPluginFrameworkTestRunnerPrivate> d_ptr;
+};
+
+#endif // CTKPLUGINFRAMEWORKTESTRUNNER_H

Libs/PluginFramework/Testing/Cpp/ctkPluginFrameworkTestUtil.cpp

@@ -0,0 +1,66 @@
+/*=============================================================================
+
+  Library: CTK
+
+  Copyright (c) German Cancer Research Center,
+    Division of Medical and Biological Informatics
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+=============================================================================*/
+
+#include "ctkPluginFrameworkTestUtil.h"
+
+#include <QFileInfo>
+#include <QLibrary>
+#include <QDirIterator>
+#include <QDebug>
+
+#include <ctkPluginContext.h>
+#include <ctkPluginException.h>
+
+QSharedPointer<ctkPlugin> ctkPluginFrameworkTestUtil::installPlugin(
+  ctkPluginContext* pc, const QString& plugin)
+{
+  qDebug() << "installPlugin(" << plugin << ")";
+  QFileInfo pluginInfo(plugin);
+  if (pluginInfo.exists() && pluginInfo.isFile() &&
+      QLibrary::isLibrary(pluginInfo.absoluteFilePath()))
+  {
+    return pc->installPlugin(QUrl::fromLocalFile(pluginInfo.absoluteFilePath()));
+  }
+  else
+  {
+    QString testPluginDir = pc->getProperty("pluginfw.testDir").toString();
+    QFileInfo testDirInfo(testPluginDir);
+    if (!testDirInfo.exists() || !testDirInfo.isDir())
+    {
+      throw ctkPluginException(QString("No plugin %1 in %2").arg(plugin).arg(testPluginDir));
+    }
+
+    QStringList libFilter;
+    libFilter << "*.dll" << "*.so" << "*.dylib";
+    QDirIterator dirIter(testDirInfo.absoluteFilePath(), libFilter, QDir::Files);
+    while (dirIter.hasNext())
+    {
+      QString lib = dirIter.next();
+      if (dirIter.fileName().contains(plugin))
+      {
+        return pc->installPlugin(QUrl::fromLocalFile(lib));
+      }
+    }
+
+    throw ctkPluginException(QString("No plugin %1 in %2").arg(plugin).arg(testPluginDir));
+  }
+}
+

Libs/PluginFramework/Testing/Cpp/ctkPluginFrameworkTestUtil.h

@@ -24,50 +24,17 @@
 #define CTKPLUGINFRAMEWORKTESTUTIL_H
 
 #include <QString>
-#include <QFileInfo>
-#include <QLibrary>
-#include <QDirIterator>
+#include <QSharedPointer>
 
-#include <ctkPluginContext.h>
-#include <ctkPluginException.h>
+class ctkPlugin;
+class ctkPluginContext;
 
 class ctkPluginFrameworkTestUtil
 {
-public:
-
-  static QSharedPointer<ctkPlugin> installPlugin(ctkPluginContext* pc, const QString& plugin)
-  { 
-    qDebug() << "installPlugin(" << plugin << ")";
-    QFileInfo pluginInfo(plugin);
-    if (pluginInfo.exists() && pluginInfo.isFile() &&
-        QLibrary::isLibrary(pluginInfo.absoluteFilePath()))
-    {
-      return pc->installPlugin(QUrl::fromLocalFile(pluginInfo.absoluteFilePath()));
-    }
-    else
-    {
-      QString testPluginDir = pc->getProperty("pluginfw.testDir").toString();
-      QFileInfo testDirInfo(testPluginDir);
-      if (!testDirInfo.exists() || !testDirInfo.isDir())
-      {
-        throw ctkPluginException(QString("No plugin %1 in %2").arg(plugin).arg(testPluginDir));
-      }
 
-      QStringList libFilter;
-      libFilter << "*.dll" << "*.so" << "*.dylib";
-      QDirIterator dirIter(testDirInfo.absoluteFilePath(), libFilter, QDir::Files);
-      while (dirIter.hasNext())
-      {
-        QString lib = dirIter.next();
-        if (dirIter.fileName().contains(plugin))
-        {
-          return pc->installPlugin(QUrl::fromLocalFile(lib));
-        }
-      }
+public:
 
-      throw ctkPluginException(QString("No plugin %1 in %2").arg(plugin).arg(testPluginDir));
-    }
-  }
+  static QSharedPointer<ctkPlugin> installPlugin(ctkPluginContext* pc, const QString& plugin);
 };
 
 #endif // CTKPLUGINFRAMEWORKTESTUTIL_H

Libs/PluginFramework/Testing/FrameworkTest/CMakeLists.txt

@@ -31,8 +31,33 @@ ctkMacroBuildPlugin(
   MOC_SRCS ${PLUGIN_MOC_SRCS}
   UI_FORMS ${PLUGIN_UI_FORMS}
   RESOURCES ${PLUGIN_resources}
-  TARGET_LIBRARIES ${PLUGIN_target_libraries}
+  TARGET_LIBRARIES ${PLUGIN_target_libraries} ${fwtestutil_lib}
   TEST_PLUGIN
 )
 
-ADD_DEPENDENCIES(${PROJECT_NAME} ${test_plugins})
+ADD_DEPENDENCIES(${PROJECT_NAME} ${fwtest_plugins})
+
+
+# =========== Build the test executable ===============
+SET(SRCS
+  ctkPluginFrameworkTestMain.cpp
+)
+
+SET(MOC_SRCS )
+
+SET(MY_MOC_CXX )
+
+#QT4_WRAP_CPP(MY_MOC_CXX ${MOC_SRCS})
+
+SET(test_executable ${fw_lib}CppTests)
+
+ADD_EXECUTABLE(${test_executable} ${SRCS} ${MY_MOC_CXX})
+TARGET_LINK_LIBRARIES(${test_executable}
+  ${fw_lib}
+  ${fwtestutil_lib}
+)
+
+ADD_DEPENDENCIES(${test_executable} ${PROJECT_NAME})
+
+ADD_TEST(${fw_lib}Tests ${CPP_TEST_PATH}/${test_executable})
+SET_PROPERTY(TEST ${fw_lib}Tests PROPERTY LABELS ${fw_lib})

Libs/PluginFramework/Testing/FrameworkTest/ctkPluginFrameworkTestMain.cpp

@@ -0,0 +1,57 @@
+/*=============================================================================
+
+  Library: CTK
+
+  Copyright (c) 2010 German Cancer Research Center,
+    Division of Medical and Biological Informatics
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+=============================================================================*/
+
+#include <QCoreApplication>
+
+
+#include <ctkPluginConstants.h>
+
+#include "ctkPluginFrameworkTestRunner.h"
+
+
+int main(int argc, char** argv)
+{
+  QCoreApplication app(argc, argv);
+
+  ctkPluginFrameworkTestRunner testRunner;
+
+  app.setOrganizationName("CTK");
+  app.setOrganizationDomain("commontk.org");
+  app.setApplicationName("ctkPluginFrameworkCppTests");
+
+  QString pluginDir;
+#ifdef CMAKE_INTDIR
+  pluginDir = qApp->applicationDirPath() + "/../test_plugins/" CMAKE_INTDIR "/";
+#else
+  pluginDir = qApp->applicationDirPath() + "/test_plugins/";
+#endif
+
+  testRunner.addPluginPath(pluginDir, false);
+  testRunner.addPlugin(pluginDir, "org_commontk_pluginfwtest");
+  testRunner.startPluginOnRun("org.commontk.pluginfwtest");
+
+  ctkProperties fwProps;
+  fwProps.insert(ctkPluginConstants::FRAMEWORK_STORAGE_CLEAN, ctkPluginConstants::FRAMEWORK_STORAGE_CLEAN_ONFIRSTINIT);
+  fwProps.insert("pluginfw.testDir", pluginDir);
+
+  testRunner.init(fwProps);
+  return testRunner.run(argc, argv);
+}

Libs/PluginFramework/Testing/FrameworkTest/ctkPluginFrameworkTestSuite.cpp

@@ -24,6 +24,7 @@
 #include <ctkPluginFrameworkTestUtil.h>
 #include <ctkPluginContext.h>
 #include <ctkPluginConstants.h>
+#include <ctkPluginException.h>
 #include <ctkServiceException.h>
 
 #include <QTest>

Libs/PluginFramework/Testing/TestPlugins/CMakeLists.txt

@@ -1,3 +1,3 @@
-foreach(test_plugin ${test_plugins})
+foreach(test_plugin ${fwtest_plugins})
   ADD_SUBDIRECTORY(${test_plugin})
 endforeach()