diff options
Diffstat (limited to 'p2pvr/daemon/unittests/testSi.cpp')
| -rw-r--r-- | p2pvr/daemon/unittests/testSi.cpp | 34 |
1 files changed, 2 insertions, 32 deletions
diff --git a/p2pvr/daemon/unittests/testSi.cpp b/p2pvr/daemon/unittests/testSi.cpp index 9e42e74..55998f9 100644 --- a/p2pvr/daemon/unittests/testSi.cpp +++ b/p2pvr/daemon/unittests/testSi.cpp @@ -1,7 +1,7 @@ #define BOOST_TEST_MODULE SI #include <boost/test/unit_test.hpp> #include <boost/filesystem/operations.hpp> -#include <testOptionsSource.h> +#include <options.h> #include <Ice/ObjectAdapter.h> #include <Ice/Service.h> #include <maintenance.h> @@ -13,40 +13,10 @@ #include <boost/uuid/uuid_io.hpp> #include <boost/lexical_cast.hpp> #include "mockDefs.h" -#include <testAppInstance.h> - -class Core : public TestAppInstance { - public: - Core() - { - int paramCount = 0; - ic = Ice::initialize(paramCount, NULL); - auto adapter = ic->createObjectAdapterWithEndpoints("Adp", "tcp -p 12002"); - TestOptionsSource::LoadTestOptions({ - { "common.datasourceRoot", (rootDir / "datasources").string() }, - }); - adapter->add(new SI(), ic->stringToIdentity("SI")); - adapter->activate(); - - si = P2PVR::SIPrx::checkedCast(ic->stringToProxy("SI")); - BOOST_REQUIRE(si); - si->ice_ping(); - } - - ~Core() - { - ic->destroy(); - } - - P2PVR::SIPrx si; - - private: - Ice::CommunicatorPtr ic; -}; BOOST_GLOBAL_FIXTURE( StandardMockDatabase ); -BOOST_FIXTURE_TEST_SUITE( SiCore, Core ) +BOOST_FIXTURE_TEST_SUITE( SiCore, TestClient ) BOOST_AUTO_TEST_CASE ( si_getEvents ) { |