diff options
Diffstat (limited to 'cpp/test')
| -rw-r--r-- | cpp/test/Ice/admin/AllTests.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/cpp/test/Ice/admin/AllTests.cpp b/cpp/test/Ice/admin/AllTests.cpp index 97a6c110045..274edaacaf0 100644 --- a/cpp/test/Ice/admin/AllTests.cpp +++ b/cpp/test/Ice/admin/AllTests.cpp @@ -190,9 +190,17 @@ allTests(const Ice::CommunicatorPtr& communicator) init.properties = Ice::createProperties(); init.properties->setProperty("Ice.Admin.Endpoints", "tcp -h 127.0.0.1"); init.properties->setProperty("Ice.Admin.InstanceName", "Test"); - Ice::CommunicatorPtr com = Ice::initialize(init); - testFacets(com); - com->destroy(); + Ice::CommunicatorHolder ich(init); + testFacets(ich.communicator()); + +#ifdef ICE_CPP11_MAPPING + // Test move assignment on CommunicatorHolder + std::shared_ptr<Ice::Communicator> nullCommunicator; + Ice::CommunicatorHolder ich2(nullCommunicator); + ich2 = std::move(ich); + test(ich2.communicator()); + test(!ich.communicator()); +#endif } { // |