summaryrefslogtreecommitdiff
path: root/cpp/test/Ice/stream/Client.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2015-06-10 12:31:10 +0200
committerBenoit Foucher <benoit@zeroc.com>2015-06-10 12:31:10 +0200
commit0370c872accb6e45905280d2c051d11f0257caac (patch)
treeb2b1fed22267a83656551c2e8e2757af6c866424 /cpp/test/Ice/stream/Client.cpp
parentFixed Glacier2 session helper and optional test leak (diff)
downloadice-0370c872accb6e45905280d2c051d11f0257caac.tar.bz2
ice-0370c872accb6e45905280d2c051d11f0257caac.tar.xz
ice-0370c872accb6e45905280d2c051d11f0257caac.zip
Fixed Ice/stream test leak (ICE-6583)
Diffstat (limited to 'cpp/test/Ice/stream/Client.cpp')
-rw-r--r--cpp/test/Ice/stream/Client.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/cpp/test/Ice/stream/Client.cpp b/cpp/test/Ice/stream/Client.cpp
index 1ab1b434e94..7dc54bdfaa7 100644
--- a/cpp/test/Ice/stream/Client.cpp
+++ b/cpp/test/Ice/stream/Client.cpp
@@ -154,7 +154,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator)
MyClassFactoryWrapperPtr factoryWrapper = new MyClassFactoryWrapper;
communicator->addObjectFactory(factoryWrapper, Test::MyClass::ice_staticId());
communicator->addObjectFactory(new MyInterfaceFactory, Test::MyInterface::ice_staticId());
-
+
Ice::InputStreamPtr in;
Ice::OutputStreamPtr out;
vector<Ice::Byte> data;
@@ -748,6 +748,8 @@ run(int, char**, const Ice::CommunicatorPtr& communicator)
c->seq9.push_back(Test::enum1);
c->d["hi"] = c;
+ c->ice_collectable(true);
+ arr.push_back(c);
}
out = Ice::createOutputStream(communicator);
out->write(arr);
@@ -788,7 +790,10 @@ run(int, char**, const Ice::CommunicatorPtr& communicator)
in = Ice::createInputStream(communicator, data);
Test::MyClassSS arr2S;
in->read(arr2S);
- test(arr2S == arrS);
+ test(arr2S.size() == arrS.size());
+ test(arr2S[0].size() == arrS[0].size());
+ test(arr2S[1].size() == arrS[1].size());
+ test(arr2S[2].size() == arrS[2].size());
}
{
@@ -891,6 +896,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator)
c->seq9.push_back(Test::enum1);
ex.c = c;
+ ex.c->ice_collectable(true);
out->write(ex);
out->finished(data);