summaryrefslogtreecommitdiff
path: root/cpp/test/Ice/faultTolerance/AllTests.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2006-07-28 15:15:29 +0000
committerBernard Normier <bernard@zeroc.com>2006-07-28 15:15:29 +0000
commita1f32efb16a91eabcedd30f357f702ea7d03b488 (patch)
tree0f5d268f6be5a2909dabf165436776cf21d5018c /cpp/test/Ice/faultTolerance/AllTests.cpp
parentadding RubyUtil (diff)
downloadice-a1f32efb16a91eabcedd30f357f702ea7d03b488.tar.bz2
ice-a1f32efb16a91eabcedd30f357f702ea7d03b488.tar.xz
ice-a1f32efb16a91eabcedd30f357f702ea7d03b488.zip
Removed nonmutating
Diffstat (limited to 'cpp/test/Ice/faultTolerance/AllTests.cpp')
-rw-r--r--cpp/test/Ice/faultTolerance/AllTests.cpp47
1 files changed, 1 insertions, 46 deletions
diff --git a/cpp/test/Ice/faultTolerance/AllTests.cpp b/cpp/test/Ice/faultTolerance/AllTests.cpp
index 3c8508541ad..2efe542995d 100644
--- a/cpp/test/Ice/faultTolerance/AllTests.cpp
+++ b/cpp/test/Ice/faultTolerance/AllTests.cpp
@@ -147,21 +147,6 @@ class AMI_Test_idempotentAbortI : public AMI_TestIntf_idempotentAbort, public AM
typedef IceUtil::Handle<AMI_Test_idempotentAbortI> AMI_Test_idempotentAbortIPtr;
-class AMI_Test_nonmutatingAbortI : public AMI_TestIntf_nonmutatingAbort, public AMI_Test_abortI
-{
- virtual void ice_response()
- {
- test(false);
- }
-
- virtual void ice_exception(const Ice::Exception& ex)
- {
- AMI_Test_abortI::ice_exception(ex);
- }
-};
-
-typedef IceUtil::Handle<AMI_Test_nonmutatingAbortI> AMI_Test_nonmutatingAbortIPtr;
-
void
allTests(const Ice::CommunicatorPtr& communicator, const vector<int>& ports)
{
@@ -257,7 +242,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const vector<int>& ports)
cout << "ok" << endl;
}
}
- else if(j == 2)
+ else if(j == 2 || j == 3)
{
if(!ami)
{
@@ -287,36 +272,6 @@ allTests(const Ice::CommunicatorPtr& communicator, const vector<int>& ports)
++i;
}
- else if(j == 3)
- {
- if(!ami)
- {
- cout << "aborting server #" << i << " and #" << i + 1 << " with nonmutating call... " << flush;
- try
- {
- obj->nonmutatingAbort();
- test(false);
- }
- catch(const Ice::ConnectionLostException&)
- {
- cout << "ok" << endl;
- }
- catch(const Ice::ConnectFailedException&)
- {
- cout << "ok" << endl;
- }
- }
- else
- {
- cout << "aborting server #" << i << " and #" << i + 1 << " with nonmutating AMI call... " << flush;
- AMI_Test_nonmutatingAbortIPtr cb = new AMI_Test_nonmutatingAbortI;
- obj->nonmutatingAbort_async(cb);
- test(cb->check());
- cout << "ok" << endl;
- }
-
- ++i;
- }
else
{
assert(false);