diff options
Diffstat (limited to 'p2pvr/daemon/unittests/testp2ice.cpp')
| -rw-r--r-- | p2pvr/daemon/unittests/testp2ice.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/p2pvr/daemon/unittests/testp2ice.cpp b/p2pvr/daemon/unittests/testp2ice.cpp index 8229bf5..dc584b6 100644 --- a/p2pvr/daemon/unittests/testp2ice.cpp +++ b/p2pvr/daemon/unittests/testp2ice.cpp @@ -5,6 +5,8 @@ #include <definedDirs.h> #include <sourceObject.h> #include <testAppInstance.h> +#include <stream.h> +#include <rowSet.h> const boost::filesystem::path variant = binDir.leaf(); const boost::filesystem::path compiler = binDir.parent_path().leaf(); @@ -15,19 +17,19 @@ static void commonTests() { - BOOST_REQUIRE(ElementLoader::getFor("p2pvrrecordingstream")); - BOOST_REQUIRE(ElementLoader::getFor("p2pvrservicestream")); - BOOST_REQUIRE(ElementLoader::getFor("P2PVR-SI-GetEvent")); + BOOST_REQUIRE(StreamFactory::get("p2pvrrecordingstream")); + BOOST_REQUIRE(StreamFactory::get("p2pvrservicestream")); + BOOST_REQUIRE(RowSetFactory::get("P2PVR-SI-GetEvent")); } static void unloadTests() { - BOOST_REQUIRE_THROW(ElementLoader::getFor("P2PVR-SI-GetEvent"), NotSupported); + BOOST_REQUIRE_THROW(RowSetFactory::get("P2PVR-SI-GetEvent"), AdHoc::NoSuchPluginException); // Known issue, these *should* unload, but for some reason, don't. - BOOST_WARN_THROW(ElementLoader::getFor("p2pvrrecordingstream"), NotSupported); - BOOST_WARN_THROW(ElementLoader::getFor("p2pvrservicestream"), NotSupported); + BOOST_WARN_THROW(StreamFactory::get("p2pvrrecordingstream"), AdHoc::NoSuchPluginException); + BOOST_WARN_THROW(StreamFactory::get("p2pvrservicestream"), AdHoc::NoSuchPluginException); } BOOST_GLOBAL_FIXTURE( TestAppInstance ); |