summaryrefslogtreecommitdiff
path: root/cpp/test/Ice/proxy/AllTests.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2014-11-04 12:15:52 +0100
committerBenoit Foucher <benoit@zeroc.com>2014-11-04 12:15:52 +0100
commit2a707c77f3342955869b98565f4abd8051a1f45a (patch)
tree55e1d24b31eac51ea2c4fdc4885f66385c058dc4 /cpp/test/Ice/proxy/AllTests.cpp
parentICE-5811 - Minor fix for Java demo distribution build (diff)
downloadice-2a707c77f3342955869b98565f4abd8051a1f45a.tar.bz2
ice-2a707c77f3342955869b98565f4abd8051a1f45a.tar.xz
ice-2a707c77f3342955869b98565f4abd8051a1f45a.zip
Fixed ICE-5819: added comments and fixed some tests to work with deactivated OA
Diffstat (limited to 'cpp/test/Ice/proxy/AllTests.cpp')
-rw-r--r--cpp/test/Ice/proxy/AllTests.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/test/Ice/proxy/AllTests.cpp b/cpp/test/Ice/proxy/AllTests.cpp
index b9371178371..54b3aa65628 100644
--- a/cpp/test/Ice/proxy/AllTests.cpp
+++ b/cpp/test/Ice/proxy/AllTests.cpp
@@ -764,7 +764,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
Test::MyClassPrx cl20 = Test::MyClassPrx::uncheckedCast(communicator->stringToProxy(ref20));
try
{
- cl20->ice_collocationOptimized(false)->ice_ping();
+ cl20->ice_ping();
test(false);
}
catch(const Ice::UnsupportedEncodingException&)
@@ -776,7 +776,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
Test::MyClassPrx cl10 = Test::MyClassPrx::uncheckedCast(communicator->stringToProxy(ref10));
cl10->ice_ping();
cl10->ice_encodingVersion(Ice::Encoding_1_0)->ice_ping();
- cl->ice_collocationOptimized(false)->ice_encodingVersion(Ice::Encoding_1_0)->ice_ping();
+ cl->ice_encodingVersion(Ice::Encoding_1_0)->ice_ping();
// 1.3 isn't supported but since a 1.3 proxy supports 1.1, the
// call will use the 1.1 encoding
@@ -797,7 +797,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
inEncaps[4] = version.major;
inEncaps[5] = version.minor;
vector<Ice::Byte> outEncaps;
- cl->ice_collocationOptimized(false)->ice_invoke("ice_ping", Ice::Normal, inEncaps, outEncaps);
+ cl->ice_invoke("ice_ping", Ice::Normal, inEncaps, outEncaps);
test(false);
}
catch(const Ice::UnknownLocalException& ex)
@@ -818,7 +818,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
inEncaps[4] = version.major;
inEncaps[5] = version.minor;
vector<Ice::Byte> outEncaps;
- cl->ice_collocationOptimized(false)->ice_invoke("ice_ping", Ice::Normal, inEncaps, outEncaps);
+ cl->ice_invoke("ice_ping", Ice::Normal, inEncaps, outEncaps);
test(false);
}
catch(const Ice::UnknownLocalException& ex)
@@ -835,7 +835,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
cl20 = Test::MyClassPrx::uncheckedCast(communicator->stringToProxy(ref20));
try
{
- cl20->ice_collocationOptimized(false)->ice_ping();
+ cl20->ice_ping();
test(false);
}
catch(const Ice::UnsupportedProtocolException&)