Commit 57013c8f authored by Valentin Martinet's avatar Valentin Martinet
Browse files

Added and fixed tests, updated to be compliant with CTest

 * imported CTR work on DicomReaderTest
 * Updated tests to be more compliant with CTest
 * Updated ActivityRegistryTest to be compliant with CTest

--HG--
branch : fw4spl_0.9.2
parent 65f9ef43
/* ***** BEGIN LICENSE BLOCK ***** /* ***** BEGIN LICENSE BLOCK *****
* FW4SPL - Copyright (C) IRCAD, 2009-2013. * FW4SPL - Copyright (C) IRCAD, 2009-2014.
* Distributed under the terms of the GNU Lesser General Public License (LGPL) as * Distributed under the terms of the GNU Lesser General Public License (LGPL) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
* ****** END LICENSE BLOCK ****** */ * ****** END LICENSE BLOCK ****** */
...@@ -10,18 +10,6 @@ ...@@ -10,18 +10,6 @@
#include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/HelperMacros.h>
#include <fwRuntime/EConfigurationElement.hpp>
namespace fwData
{
class Object;
}
namespace fwRuntime
{
class EConfigurationElement;
}
namespace ioITK namespace ioITK
{ {
namespace ut namespace ut
...@@ -52,14 +40,6 @@ public: ...@@ -52,14 +40,6 @@ public:
void ImageSeriesInrTest(); void ImageSeriesInrTest();
void SeriesDBInrTest(); void SeriesDBInrTest();
private :
void executeService(
const SPTR(::fwData::Object)& obj,
const std::string& srvType,
const std::string& srvImpl,
const SPTR(::fwRuntime::EConfigurationElement)& cfg);
}; };
} //namespace ut } //namespace ut
......
...@@ -73,7 +73,7 @@ void IoItkTest::tearDown() ...@@ -73,7 +73,7 @@ void IoItkTest::tearDown()
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void IoItkTest::executeService( void executeService(
const SPTR(::fwData::Object)& obj, const SPTR(::fwData::Object)& obj,
const std::string& srvType, const std::string& srvType,
const std::string& srvImpl, const std::string& srvImpl,
...@@ -114,7 +114,7 @@ void IoItkTest::testImageSeriesWriterJPG() ...@@ -114,7 +114,7 @@ void IoItkTest::testImageSeriesWriterJPG()
srvCfg->addConfigurationElement(folderCfg); srvCfg->addConfigurationElement(folderCfg);
// Create and execute service // Create and execute service
this->executeService(imageSeries, "::io::IWriter", "::ioITK::SJpgImageSeriesWriter", srvCfg); executeService(imageSeries, "::io::IWriter", "::ioITK::SJpgImageSeriesWriter", srvCfg);
// Remove path // Remove path
::boost::filesystem::remove_all( path.string() ); ::boost::filesystem::remove_all( path.string() );
...@@ -140,7 +140,7 @@ void IoItkTest::testImageWriterJPG() ...@@ -140,7 +140,7 @@ void IoItkTest::testImageWriterJPG()
srvCfg->addConfigurationElement(folderCfg); srvCfg->addConfigurationElement(folderCfg);
// Create and execute service // Create and execute service
this->executeService( image, "::io::IWriter", "::ioITK::JpgImageWriterService", srvCfg ); executeService( image, "::io::IWriter", "::ioITK::JpgImageWriterService", srvCfg );
// Remove path // Remove path
::boost::filesystem::remove_all( path.string() ); ::boost::filesystem::remove_all( path.string() );
...@@ -173,11 +173,11 @@ void IoItkTest::testSaveLoadInr() ...@@ -173,11 +173,11 @@ void IoItkTest::testSaveLoadInr()
srvCfg->addConfigurationElement(fileCfg); srvCfg->addConfigurationElement(fileCfg);
// Create and execute service // Create and execute service
this->executeService( image, "::io::IWriter", "::ioITK::InrImageWriterService", srvCfg ); executeService( image, "::io::IWriter", "::ioITK::InrImageWriterService", srvCfg );
// load Image // load Image
::fwData::Image::sptr image2 = ::fwData::Image::New(); ::fwData::Image::sptr image2 = ::fwData::Image::New();
this->executeService( image2, "::io::IReader", "::ioITK::InrImageReaderService", srvCfg ); executeService( image2, "::io::IReader", "::ioITK::InrImageReaderService", srvCfg );
::boost::filesystem::remove_all( PATH.parent_path().string() ); ::boost::filesystem::remove_all( PATH.parent_path().string() );
...@@ -214,11 +214,11 @@ void IoItkTest::ImageSeriesInrTest() ...@@ -214,11 +214,11 @@ void IoItkTest::ImageSeriesInrTest()
srvCfg->addConfigurationElement(fileCfg); srvCfg->addConfigurationElement(fileCfg);
// Create and execute service // Create and execute service
this->executeService( imageSeries, "::io::IWriter", "::ioITK::SImageSeriesWriter", srvCfg ); executeService( imageSeries, "::io::IWriter", "::ioITK::SImageSeriesWriter", srvCfg );
// load Image // load Image
::fwData::Image::sptr image2 = ::fwData::Image::New(); ::fwData::Image::sptr image2 = ::fwData::Image::New();
this->executeService( image2, "::io::IReader", "::ioITK::InrImageReaderService", srvCfg ); executeService( image2, "::io::IReader", "::ioITK::InrImageReaderService", srvCfg );
::boost::filesystem::remove_all( PATH.parent_path().string() ); ::boost::filesystem::remove_all( PATH.parent_path().string() );
...@@ -252,7 +252,7 @@ void IoItkTest::SeriesDBInrTest() ...@@ -252,7 +252,7 @@ void IoItkTest::SeriesDBInrTest()
// load SeriesDB // load SeriesDB
::fwMedData::SeriesDB::sptr sdb = ::fwMedData::SeriesDB::New(); ::fwMedData::SeriesDB::sptr sdb = ::fwMedData::SeriesDB::New();
this->executeService( sdb, "::io::IReader", "::ioITK::SInrSeriesDBReader", srvCfg ); executeService( sdb, "::io::IReader", "::ioITK::SInrSeriesDBReader", srvCfg );
::fwData::Image::SpacingType spacing = list_of(0.781)(0.781)(1.6); ::fwData::Image::SpacingType spacing = list_of(0.781)(0.781)(1.6);
::fwData::Image::SizeType size = list_of(512)(512)(134); ::fwData::Image::SizeType size = list_of(512)(512)(134);
......
/* ***** BEGIN LICENSE BLOCK ***** /* ***** BEGIN LICENSE BLOCK *****
* FW4SPL - Copyright (C) IRCAD, 2009-2013. * FW4SPL - Copyright (C) IRCAD, 2009-2014.
* Distributed under the terms of the GNU Lesser General Public License (LGPL) as * Distributed under the terms of the GNU Lesser General Public License (LGPL) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
* ****** END LICENSE BLOCK ****** */ * ****** END LICENSE BLOCK ****** */
...@@ -9,11 +9,6 @@ ...@@ -9,11 +9,6 @@
#include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/HelperMacros.h>
namespace fwData
{
class Image;
}
namespace ioVTK namespace ioVTK
{ {
namespace ut namespace ut
...@@ -51,15 +46,6 @@ public: ...@@ -51,15 +46,6 @@ public:
void testMhdImageWriter(); void testMhdImageWriter();
void testImageWriterExtension(); void testImageWriterExtension();
private :
void runImageSrv(
const std::string &srvtype,
const std::string &srv,
const SPTR(::fwRuntime::EConfigurationElement)& cfg,
const SPTR(::fwData::Object)& image);
}; };
} //namespace ut } //namespace ut
......
/* ***** BEGIN LICENSE BLOCK ***** /* ***** BEGIN LICENSE BLOCK *****
* FW4SPL - Copyright (C) IRCAD, 2009-2013. * FW4SPL - Copyright (C) IRCAD, 2009-2014.
* Distributed under the terms of the GNU Lesser General Public License (LGPL) as * Distributed under the terms of the GNU Lesser General Public License (LGPL) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
* ****** END LICENSE BLOCK ****** */ * ****** END LICENSE BLOCK ****** */
...@@ -7,8 +7,6 @@ ...@@ -7,8 +7,6 @@
#ifndef _IOVTK_TEST_TU_SERIESDBREADERTEST_HPP_ #ifndef _IOVTK_TEST_TU_SERIESDBREADERTEST_HPP_
#define _IOVTK_TEST_TU_SERIESDBREADERTEST_HPP_ #define _IOVTK_TEST_TU_SERIESDBREADERTEST_HPP_
#include <fwMedData/SeriesDB.hpp>
#include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/HelperMacros.h>
namespace ioVTK namespace ioVTK
......
...@@ -44,6 +44,32 @@ namespace ioVTK ...@@ -44,6 +44,32 @@ namespace ioVTK
namespace ut namespace ut
{ {
//------------------------------------------------------------------------------
void runImageSrv(
const std::string &srvtype,
const std::string &srvname,
const SPTR(::fwRuntime::EConfigurationElement)& cfg,
const SPTR(::fwData::Object)& image)
{
::fwServices::IService::sptr srv;
srv = ::fwServices::registry::ServiceFactory::getDefault()->create( srvtype, srvname );
CPPUNIT_ASSERT_MESSAGE(std::string("Failed to create service ") + srvname, srv);
::fwServices::OSR::registerService( image , srv );
CPPUNIT_ASSERT_NO_THROW( srv->setConfiguration(cfg) );
CPPUNIT_ASSERT_NO_THROW( srv->configure() );
CPPUNIT_ASSERT_NO_THROW( srv->start() );
CPPUNIT_ASSERT_NO_THROW( srv->update() );
CPPUNIT_ASSERT_NO_THROW( srv->stop() );
::fwServices::OSR::unregisterService( srv );
}
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void ImageReaderWriterTest::setUp() void ImageReaderWriterTest::setUp()
...@@ -95,7 +121,7 @@ void ImageReaderWriterTest::testVtkImageReader() ...@@ -95,7 +121,7 @@ void ImageReaderWriterTest::testVtkImageReader()
sizeExpected[1] = 170; sizeExpected[1] = 170;
sizeExpected[2] = 58; sizeExpected[2] = 58;
this->runImageSrv("::io::IReader","::ioVTK::ImageReaderService",getIOConfiguration(file), image); runImageSrv("::io::IReader","::ioVTK::ImageReaderService",getIOConfiguration(file), image);
// Data read. // Data read.
::fwData::Image::SpacingType spacingRead = image->getSpacing(); ::fwData::Image::SpacingType spacingRead = image->getSpacing();
...@@ -127,7 +153,7 @@ void ImageReaderWriterTest::testVtiImageReader() ...@@ -127,7 +153,7 @@ void ImageReaderWriterTest::testVtiImageReader()
const ::boost::filesystem::path file = ::fwTest::Data::dir() /"fw4spl/image/vti/BostonTeapot.vti"; const ::boost::filesystem::path file = ::fwTest::Data::dir() /"fw4spl/image/vti/BostonTeapot.vti";
::fwData::Image::sptr image = ::fwData::Image::New(); ::fwData::Image::sptr image = ::fwData::Image::New();
this->runImageSrv("::io::IReader","::ioVTK::ImageReaderService",getIOConfiguration(file), image); runImageSrv("::io::IReader","::ioVTK::ImageReaderService",getIOConfiguration(file), image);
// Data expected // Data expected
const size_t dim = 3; const size_t dim = 3;
...@@ -180,7 +206,7 @@ void ImageReaderWriterTest::testMhdImageReader() ...@@ -180,7 +206,7 @@ void ImageReaderWriterTest::testMhdImageReader()
const ::boost::filesystem::path file = ::fwTest::Data::dir() / "fw4spl/image/mhd/BostonTeapot.mhd"; const ::boost::filesystem::path file = ::fwTest::Data::dir() / "fw4spl/image/mhd/BostonTeapot.mhd";
::fwData::Image::sptr image = ::fwData::Image::New(); ::fwData::Image::sptr image = ::fwData::Image::New();
this->runImageSrv("::io::IReader","::ioVTK::ImageReaderService",getIOConfiguration(file), image); runImageSrv("::io::IReader","::ioVTK::ImageReaderService",getIOConfiguration(file), image);
// Data expected // Data expected
const size_t dim = 3; const size_t dim = 3;
...@@ -287,12 +313,12 @@ void ImageReaderWriterTest::testVtkImageWriter() ...@@ -287,12 +313,12 @@ void ImageReaderWriterTest::testVtkImageWriter()
// Write to vtk image. // Write to vtk image.
const ::boost::filesystem::path file = ::fwTools::System::getTemporaryFolder() / "temporaryFile.vtk"; const ::boost::filesystem::path file = ::fwTools::System::getTemporaryFolder() / "temporaryFile.vtk";
this->runImageSrv("::io::IWriter","::ioVTK::ImageWriterService",getIOConfiguration(file), image); runImageSrv("::io::IWriter","::ioVTK::ImageWriterService",getIOConfiguration(file), image);
// Read image from disk // Read image from disk
::fwData::Image::sptr imageFromDisk = ::fwData::Image::New(); ::fwData::Image::sptr imageFromDisk = ::fwData::Image::New();
this->runImageSrv("::io::IReader","::ioVTK::ImageReaderService",getIOConfiguration(file), imageFromDisk); runImageSrv("::io::IReader","::ioVTK::ImageReaderService",getIOConfiguration(file), imageFromDisk);
::boost::filesystem::remove(file); ::boost::filesystem::remove(file);
...@@ -343,11 +369,11 @@ void ImageReaderWriterTest::testVtkImageSeriesWriter() ...@@ -343,11 +369,11 @@ void ImageReaderWriterTest::testVtkImageSeriesWriter()
const ::boost::filesystem::path file = ::fwTools::System::getTemporaryFolder() / "imageSeries.vtk"; const ::boost::filesystem::path file = ::fwTools::System::getTemporaryFolder() / "imageSeries.vtk";
// Write image series // Write image series
this->runImageSrv("::io::IWriter", "::ioVTK::SImageSeriesWriter", getIOConfiguration(file), imageSeries); runImageSrv("::io::IWriter", "::ioVTK::SImageSeriesWriter", getIOConfiguration(file), imageSeries);
// Read image series // Read image series
::fwData::Image::sptr newImage = ::fwData::Image::New(); ::fwData::Image::sptr newImage = ::fwData::Image::New();
this->runImageSrv("::io::IReader","::ioVTK::ImageReaderService", getIOConfiguration(file), newImage); runImageSrv("::io::IReader","::ioVTK::ImageReaderService", getIOConfiguration(file), newImage);
::fwDataCamp::visitor::CompareObjects visitor; ::fwDataCamp::visitor::CompareObjects visitor;
visitor.compare(image, newImage); visitor.compare(image, newImage);
...@@ -380,12 +406,12 @@ void ImageReaderWriterTest::testVtiImageWriter() ...@@ -380,12 +406,12 @@ void ImageReaderWriterTest::testVtiImageWriter()
// Write to vtk image. // Write to vtk image.
const ::boost::filesystem::path file = ::fwTools::System::getTemporaryFolder() / "temporaryFile.vti"; const ::boost::filesystem::path file = ::fwTools::System::getTemporaryFolder() / "temporaryFile.vti";
this->runImageSrv("::io::IWriter","::ioVTK::ImageWriterService",getIOConfiguration(file), image); runImageSrv("::io::IWriter","::ioVTK::ImageWriterService",getIOConfiguration(file), image);
// Read image from disk // Read image from disk
::fwData::Image::sptr imageFromDisk = ::fwData::Image::New(); ::fwData::Image::sptr imageFromDisk = ::fwData::Image::New();
this->runImageSrv("::io::IReader","::ioVTK::ImageReaderService",getIOConfiguration(file), imageFromDisk); runImageSrv("::io::IReader","::ioVTK::ImageReaderService",getIOConfiguration(file), imageFromDisk);
// Data read // Data read
::fwData::Image::SpacingType spacingRead = imageFromDisk->getSpacing(); ::fwData::Image::SpacingType spacingRead = imageFromDisk->getSpacing();
...@@ -446,11 +472,11 @@ void ImageReaderWriterTest::testMhdImageWriter() ...@@ -446,11 +472,11 @@ void ImageReaderWriterTest::testMhdImageWriter()
// Write to vtk image. // Write to vtk image.
const ::boost::filesystem::path file = ::fwTools::System::getTemporaryFolder()/ "temporaryFile.mhd"; const ::boost::filesystem::path file = ::fwTools::System::getTemporaryFolder()/ "temporaryFile.mhd";
this->runImageSrv("::io::IWriter","::ioVTK::ImageWriterService",getIOConfiguration(file), image); runImageSrv("::io::IWriter","::ioVTK::ImageWriterService",getIOConfiguration(file), image);
// Read image from disk // Read image from disk
::fwData::Image::sptr imageFromDisk = ::fwData::Image::New(); ::fwData::Image::sptr imageFromDisk = ::fwData::Image::New();
this->runImageSrv("::io::IReader","::ioVTK::ImageReaderService",getIOConfiguration(file), imageFromDisk); runImageSrv("::io::IReader","::ioVTK::ImageReaderService",getIOConfiguration(file), imageFromDisk);
// Data read // Data read
::fwData::Image::SpacingType spacingRead = imageFromDisk->getSpacing(); ::fwData::Image::SpacingType spacingRead = imageFromDisk->getSpacing();
...@@ -535,30 +561,6 @@ void ImageReaderWriterTest::testImageWriterExtension() ...@@ -535,30 +561,6 @@ void ImageReaderWriterTest::testImageWriterExtension()
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void ImageReaderWriterTest::runImageSrv(
const std::string &srvtype,
const std::string &srvname,
const SPTR(::fwRuntime::EConfigurationElement)& cfg,
const SPTR(::fwData::Object)& image)
{
::fwServices::IService::sptr srv;
srv = ::fwServices::registry::ServiceFactory::getDefault()->create( srvtype, srvname );
CPPUNIT_ASSERT_MESSAGE(std::string("Failed to create service ") + srvname, srv);
::fwServices::OSR::registerService( image , srv );
CPPUNIT_ASSERT_NO_THROW( srv->setConfiguration(cfg) );
CPPUNIT_ASSERT_NO_THROW( srv->configure() );
CPPUNIT_ASSERT_NO_THROW( srv->start() );
CPPUNIT_ASSERT_NO_THROW( srv->update() );
CPPUNIT_ASSERT_NO_THROW( srv->stop() );
::fwServices::OSR::unregisterService( srv );
}
//------------------------------------------------------------------------------
} //namespace ut } //namespace ut
} //namespace ioVTK } //namespace ioVTK
/* ***** BEGIN LICENSE BLOCK ***** /* ***** BEGIN LICENSE BLOCK *****
* FW4SPL - Copyright (C) IRCAD, 2009-2013. * FW4SPL - Copyright (C) IRCAD, 2009-2014.
* Distributed under the terms of the GNU Lesser General Public License (LGPL) as * Distributed under the terms of the GNU Lesser General Public License (LGPL) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
* ****** END LICENSE BLOCK ****** */ * ****** END LICENSE BLOCK ****** */
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <fwMedData/ImageSeries.hpp> #include <fwMedData/ImageSeries.hpp>
#include <fwMedData/ModelSeries.hpp> #include <fwMedData/ModelSeries.hpp>
#include <fwMedData/Series.hpp> #include <fwMedData/Series.hpp>
#include <fwMedData/SeriesDB.hpp>
#include <fwDataCamp/visitor/CompareObjects.hpp> #include <fwDataCamp/visitor/CompareObjects.hpp>
......
/* ***** BEGIN LICENSE BLOCK ***** /* ***** BEGIN LICENSE BLOCK *****
* FW4SPL - Copyright (C) IRCAD, 2009-2013. * FW4SPL - Copyright (C) IRCAD, 2009-2014.
* Distributed under the terms of the GNU Lesser General Public License (LGPL) as * Distributed under the terms of the GNU Lesser General Public License (LGPL) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
* ****** END LICENSE BLOCK ****** */ * ****** END LICENSE BLOCK ****** */
...@@ -9,18 +9,6 @@ ...@@ -9,18 +9,6 @@
#include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/HelperMacros.h>
#include <fwRuntime/EConfigurationElement.hpp>
namespace fwData
{
class Object;
}
namespace fwRuntime
{
class EConfigurationElement;
}
namespace patchMedicalData namespace patchMedicalData
{ {
namespace ut namespace ut
......
/* ***** BEGIN LICENSE BLOCK ***** /* ***** BEGIN LICENSE BLOCK *****
* FW4SPL - Copyright (C) IRCAD, 2009-2013. * FW4SPL - Copyright (C) IRCAD, 2009-2014.
* Distributed under the terms of the GNU Lesser General Public License (LGPL) as * Distributed under the terms of the GNU Lesser General Public License (LGPL) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
* ****** END LICENSE BLOCK ****** */ * ****** END LICENSE BLOCK ****** */
...@@ -9,18 +9,14 @@ ...@@ -9,18 +9,14 @@
#include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/HelperMacros.h>
namespace fwRuntime
{
struct Bundle;
}
namespace fwActivities namespace fwActivities
{ {
namespace ut namespace ut
{ {
struct ActivityRegistryTestPimpl;
class ActivityRegistryTest : public CPPUNIT_NS::TestFixture class ActivityRegistryTest : public CPPUNIT_NS::TestFixture
{ {
CPPUNIT_TEST_SUITE( ActivityRegistryTest ); CPPUNIT_TEST_SUITE( ActivityRegistryTest );
...@@ -38,8 +34,7 @@ public: ...@@ -38,8 +34,7 @@ public:
protected: protected:
SPTR( fwRuntime::Bundle ) m_bundle; SPTR( ActivityRegistryTestPimpl ) m_pimpl;
SPTR( fwActivities::registry::Activities ) m_activities;
}; };
} //namespace ut } //namespace ut
......
/* ***** BEGIN LICENSE BLOCK ***** /* ***** BEGIN LICENSE BLOCK *****
* FW4SPL - Copyright (C) IRCAD, 2009-2013. * FW4SPL - Copyright (C) IRCAD, 2009-2014.
* Distributed under the terms of the GNU Lesser General Public License (LGPL) as * Distributed under the terms of the GNU Lesser General Public License (LGPL) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
* ****** END LICENSE BLOCK ****** */ * ****** END LICENSE BLOCK ****** */
...@@ -29,19 +29,27 @@ namespace fwActivities ...@@ -29,19 +29,27 @@ namespace fwActivities
namespace ut namespace ut
{ {
struct ActivityRegistryTestPimpl
{
public:
SPTR(::fwRuntime::Bundle) bundle;
::fwActivities::registry::Activities::sptr activities;
};
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void ActivityRegistryTest::setUp() void ActivityRegistryTest::setUp()
{ {
m_pimpl = ::boost::make_shared< ActivityRegistryTestPimpl >();
::boost::filesystem::path plugin = "share/tu_exec_fwActivities_0-0/tu_registry"; ::boost::filesystem::path plugin = "share/tu_exec_fwActivities_0-0/tu_registry";
m_bundle = ::fwRuntime::io::BundleDescriptorReader::createBundle(plugin); m_pimpl->bundle = ::fwRuntime::io::BundleDescriptorReader::createBundle(plugin);
m_activities = fwActivities::registry::Activities::New(); m_pimpl->activities = fwActivities::registry::Activities::New();
::fwRuntime::Bundle::ExtensionContainer extensionsSet( m_bundle->extensionsBegin(), m_bundle->extensionsEnd()); ::fwRuntime::Bundle::ExtensionContainer extensionsSet( m_pimpl->bundle->extensionsBegin(), m_pimpl->bundle->extensionsEnd());
std::vector< SPTR( ::fwRuntime::Extension ) > extensions(extensionsSet.begin(), extensionsSet.end()); std::vector< SPTR( ::fwRuntime::Extension ) > extensions(extensionsSet.begin(), extensionsSet.end());
m_activities->parseBundleInformation(extensions); m_pimpl->activities->parseBundleInformation(extensions);
CPPUNIT_ASSERT_EQUAL( size_t(8) , extensions.size()); CPPUNIT_ASSERT_EQUAL( size_t(8) , extensions.size());
...@@ -53,7 +61,7 @@ void ActivityRegistryTest::setUp() ...@@ -53,7 +61,7 @@ void ActivityRegistryTest::setUp()
void ActivityRegistryTest::tearDown() void ActivityRegistryTest::tearDown()
{ {
// Clean up after the test run. // Clean up after the test run.
m_bundle.reset(); m_pimpl.reset();