diff options
Diffstat (limited to 'cpp/test/Ice/objects')
| -rw-r--r-- | cpp/test/Ice/objects/AllTests.cpp | 52 | ||||
| -rw-r--r-- | cpp/test/Ice/objects/Client.cpp | 56 | ||||
| -rw-r--r-- | cpp/test/Ice/objects/Collocated.cpp | 26 | ||||
| -rw-r--r-- | cpp/test/Ice/objects/Server.cpp | 26 | ||||
| -rw-r--r-- | cpp/test/Ice/objects/TestI.cpp | 2 |
5 files changed, 81 insertions, 81 deletions
diff --git a/cpp/test/Ice/objects/AllTests.cpp b/cpp/test/Ice/objects/AllTests.cpp index 7144ee7e861..91161ac04c2 100644 --- a/cpp/test/Ice/objects/AllTests.cpp +++ b/cpp/test/Ice/objects/AllTests.cpp @@ -140,32 +140,32 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) if(!collocated) { - cout << "testing UnexpectedObjectException... " << flush; - ref = "uoet:default -p 12010 -t 10000"; - base = communicator->stringToProxy(ref); - test(base); - UnexpectedObjectExceptionTestPrx uoet = UnexpectedObjectExceptionTestPrx::uncheckedCast(base); - test(uoet); - try - { - uoet->op(); - test(false); - } - catch(const Ice::UnexpectedObjectException& ex) - { - test(ex.type == "::Test::AlsoEmpty"); - test(ex.expectedType == "::Test::Empty"); - } - catch(const Ice::Exception& ex) - { - cout << ex << endl; - test(false); - } - catch(...) - { - test(false); - } - cout << "ok" << endl; + cout << "testing UnexpectedObjectException... " << flush; + ref = "uoet:default -p 12010 -t 10000"; + base = communicator->stringToProxy(ref); + test(base); + UnexpectedObjectExceptionTestPrx uoet = UnexpectedObjectExceptionTestPrx::uncheckedCast(base); + test(uoet); + try + { + uoet->op(); + test(false); + } + catch(const Ice::UnexpectedObjectException& ex) + { + test(ex.type == "::Test::AlsoEmpty"); + test(ex.expectedType == "::Test::Empty"); + } + catch(const Ice::Exception& ex) + { + cout << ex << endl; + test(false); + } + catch(...) + { + test(false); + } + cout << "ok" << endl; } return initial; diff --git a/cpp/test/Ice/objects/Client.cpp b/cpp/test/Ice/objects/Client.cpp index 3c057524e36..3e7f3fcfa13 100644 --- a/cpp/test/Ice/objects/Client.cpp +++ b/cpp/test/Ice/objects/Client.cpp @@ -20,25 +20,25 @@ public: virtual Ice::ObjectPtr create(const string& type) { - if(type == "::Test::B") - { - return new BI; - } - else if(type == "::Test::C") - { - return new CI; - } - else if(type == "::Test::D") - { - return new DI; - } - assert(false); // Should never be reached - return 0; + if(type == "::Test::B") + { + return new BI; + } + else if(type == "::Test::C") + { + return new CI; + } + else if(type == "::Test::D") + { + return new DI; + } + assert(false); // Should never be reached + return 0; } virtual void destroy() { - // Nothing to do + // Nothing to do } }; @@ -64,26 +64,26 @@ main(int argc, char* argv[]) try { - communicator = Ice::initialize(argc, argv); - status = run(argc, argv, communicator); + communicator = Ice::initialize(argc, argv); + status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) { - cerr << ex << endl; - status = EXIT_FAILURE; + cerr << ex << endl; + status = EXIT_FAILURE; } if(communicator) { - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + try + { + communicator->destroy(); + } + catch(const Ice::Exception& ex) + { + cerr << ex << endl; + status = EXIT_FAILURE; + } } return status; diff --git a/cpp/test/Ice/objects/Collocated.cpp b/cpp/test/Ice/objects/Collocated.cpp index a61ce056025..ed26a370e30 100644 --- a/cpp/test/Ice/objects/Collocated.cpp +++ b/cpp/test/Ice/objects/Collocated.cpp @@ -35,26 +35,26 @@ main(int argc, char* argv[]) try { - communicator = Ice::initialize(argc, argv); - status = run(argc, argv, communicator); + communicator = Ice::initialize(argc, argv); + status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) { - cerr << ex << endl; - status = EXIT_FAILURE; + cerr << ex << endl; + status = EXIT_FAILURE; } if(communicator) { - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + try + { + communicator->destroy(); + } + catch(const Ice::Exception& ex) + { + cerr << ex << endl; + status = EXIT_FAILURE; + } } return status; diff --git a/cpp/test/Ice/objects/Server.cpp b/cpp/test/Ice/objects/Server.cpp index c5b7d672501..25379cd3be7 100644 --- a/cpp/test/Ice/objects/Server.cpp +++ b/cpp/test/Ice/objects/Server.cpp @@ -35,26 +35,26 @@ main(int argc, char* argv[]) try { - communicator = Ice::initialize(argc, argv); - status = run(argc, argv, communicator); + communicator = Ice::initialize(argc, argv); + status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) { - cerr << ex << endl; - status = EXIT_FAILURE; + cerr << ex << endl; + status = EXIT_FAILURE; } if(communicator) { - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + try + { + communicator->destroy(); + } + catch(const Ice::Exception& ex) + { + cerr << ex << endl; + status = EXIT_FAILURE; + } } return status; diff --git a/cpp/test/Ice/objects/TestI.cpp b/cpp/test/Ice/objects/TestI.cpp index 9f141b6a63a..4beaa5477fc 100644 --- a/cpp/test/Ice/objects/TestI.cpp +++ b/cpp/test/Ice/objects/TestI.cpp @@ -162,7 +162,7 @@ InitialI::getAll(BPtr& b1, BPtr& b2, CPtr& c, DPtr& d, const Ice::Current&) bool UnexpectedObjectExceptionTestI::ice_invoke(const std::vector<Ice::Byte>&, std::vector<Ice::Byte>& outParams, - const Ice::Current& current) + const Ice::Current& current) { Ice::CommunicatorPtr communicator = current.adapter->getCommunicator(); Ice::OutputStreamPtr out = Ice::createOutputStream(communicator); |