From 690ae9759609fc1b50b8d75b219ec34a90d50484 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Wed, 12 Jul 2017 12:13:02 +0100 Subject: Test options with more realistic DryIce --- icetray/unittests/testIceTrayOptions.cpp | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/icetray/unittests/testIceTrayOptions.cpp b/icetray/unittests/testIceTrayOptions.cpp index a8fe157..22776b9 100644 --- a/icetray/unittests/testIceTrayOptions.cpp +++ b/icetray/unittests/testIceTrayOptions.cpp @@ -6,26 +6,31 @@ #include #include #include "icetrayService.h" +#include "dryice.h" class TestService : public IceTray::Service { public: void addObjects(const std::string &, const Ice::CommunicatorPtr &, const Ice::StringSeq &, const Ice::ObjectAdapterPtr &) { + // Verifies option resolution is available for addObjects. + IceTray::OptionsResolver myOpts; } }; +NAMEDFACTORY("default", TestService, IceTray::ServiceFactory); + +class DI : public IceTray::DryIce { + public: + DI() : IceTray::DryIce({ + "--testInt=3", + "--vec=1,2,4,8" + }) + { + } +}; +BOOST_GLOBAL_FIXTURE(DI); BOOST_AUTO_TEST_CASE( testOptions ) { - auto ic = Ice::initialize(); - auto p = ic->getProperties(); - p->setProperty("test.Endpoints", "default"); - p->setProperty("testInt", "3"); - p->setProperty("vec", "1,2,4,8"); - BOOST_REQUIRE_EQUAL(4, p->getPropertyAsList("vec").size()); - - TestService ts; - ts.start("", ic, {}); - IceTray::OptionsResolver myOpts; BOOST_REQUIRE_EQUAL(3, myOpts->testInt); BOOST_REQUIRE_EQUAL("some string", myOpts->testString); @@ -34,8 +39,5 @@ BOOST_AUTO_TEST_CASE( testOptions ) BOOST_REQUIRE_EQUAL(2, myOpts->testVec[1]); BOOST_REQUIRE_EQUAL(4, myOpts->testVec[2]); BOOST_REQUIRE_EQUAL(8, myOpts->testVec[3]); - - ts.stop(); - ic->destroy(); } -- cgit v1.2.3