diff options
| author | Jose <jose@zeroc.com> | 2018-06-01 17:41:03 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2018-06-01 17:41:03 +0200 |
| commit | cbe92e540a7f02f0bdf93192424bd119189365b7 (patch) | |
| tree | 411c50dc0ae9c669d31a940b1b4903b5deac4f12 /cpp/test/Ice/exceptions/AllTests.cpp | |
| parent | Fixed Util.py check for binary installation directory on Windows (diff) | |
| download | ice-cbe92e540a7f02f0bdf93192424bd119189365b7.tar.bz2 ice-cbe92e540a7f02f0bdf93192424bd119189365b7.tar.xz ice-cbe92e540a7f02f0bdf93192424bd119189365b7.zip | |
Do not use Ice::Application for Ice testsuite
Diffstat (limited to 'cpp/test/Ice/exceptions/AllTests.cpp')
| -rw-r--r-- | cpp/test/Ice/exceptions/AllTests.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp index 9940da22f57..ba305f19bc7 100644 --- a/cpp/test/Ice/exceptions/AllTests.cpp +++ b/cpp/test/Ice/exceptions/AllTests.cpp @@ -9,7 +9,7 @@ #include <IceUtil/IceUtil.h> #include <Ice/Ice.h> -#include <TestCommon.h> +#include <TestHelper.h> #include <Test.h> using namespace std; @@ -402,8 +402,9 @@ endsWith(const string& s, const string& findme) } ThrowerPrxPtr -allTests(const Ice::CommunicatorPtr& communicator) +allTests(Test::TestHelper* helper) { + Ice::CommunicatorPtr communicator = helper->communicator(); const string protocol = communicator->getProperties()->getProperty("Ice.Default.Protocol"); cout << "testing ice_print()/what()... " << flush; @@ -691,7 +692,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "ok" << endl; cout << "testing stringToProxy... " << flush; - string ref = "thrower:" + getTestEndpoint(communicator, 0); + string ref = "thrower:" + helper->getTestEndpoint(); Ice::ObjectPrxPtr base = communicator->stringToProxy(ref); test(base); cout << "ok" << endl; @@ -1002,7 +1003,7 @@ allTests(const Ice::CommunicatorPtr& communicator) try { ThrowerPrxPtr thrower2 = - ICE_UNCHECKED_CAST(ThrowerPrx, communicator->stringToProxy("thrower:" + getTestEndpoint(communicator, 1))); + ICE_UNCHECKED_CAST(ThrowerPrx, communicator->stringToProxy("thrower:" + helper->getTestEndpoint(1))); try { thrower2->throwMemoryLimitException(Ice::ByteSeq(2 * 1024 * 1024)); // 2MB (no limits) @@ -1011,7 +1012,7 @@ allTests(const Ice::CommunicatorPtr& communicator) { } ThrowerPrxPtr thrower3 = - ICE_UNCHECKED_CAST(ThrowerPrx, communicator->stringToProxy("thrower:" + getTestEndpoint(communicator, 2))); + ICE_UNCHECKED_CAST(ThrowerPrx, communicator->stringToProxy("thrower:" + helper->getTestEndpoint(2))); try { thrower3->throwMemoryLimitException(Ice::ByteSeq(1024)); // 1KB limit |